Merge pull request #12 from B00tLoad/flagexclusivity

Implemented checking flags for exclusivity

.gitignore

@@ -2,4 +2,4 @@
 /target/
 .idea/
 compile.bat
-.vscode/
+/.vscode/

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "java.configuration.updateBuildConfiguration": "interactive"
-}

src/main/java/de/b00tload/tools/lastfmtospotifyplaylist/LastFMToSpotify.java

@@ -36,10 +36,13 @@ public class LastFMToSpotify {
         configuration = new HashMap<>();
         configuration.put("requests.useragent", "LastFMToSpotify/1.0-Snapshot (" + System.getProperty("os.name") + "; " + System.getProperty("os.arch") + ") Java/" + System.getProperty("java.version"));
         configuration.put("playlist.name", "LastFMToSpotify@" + LocalDateTime.now(Clock.systemDefaultZone()).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
-        configuration.put("log.level", "1");
+        configuration.put("logging.level", "1");
         if (!ArgumentHandler.checkArguments(args)) {
             return;
         }
+        if(!ArgumentHandler.checkExclusivity(args)){
+            return;
+        }
         
         // parse arguments
         for (int a = 0; a < args.length; a++) {
@@ -111,9 +114,6 @@ public class LastFMToSpotify {
                     searchQuery.append(" album:").append(track.getAlbum());
                 logLn("Search query: " + searchQuery, 3);
                 se.michaelthelin.spotify.model_objects.specification.Track[] add = api.searchTracks(searchQuery.toString()).market(CountryCode.DE).setHeader("User-Agent", configuration.get("requests.useragent")).build().execute().getItems();
-                if(add.length!=0) {
-//                    adders.add(add[0].getUri());
-//                    logLn("Added " + add[0].getName() + " to " + configuration.get("playlist.name"), 3);
                 for(se.michaelthelin.spotify.model_objects.specification.Track t : add){
                     if(t.getName().equalsIgnoreCase(track.getName())){
                         adders.add(t.getUri());
@@ -122,7 +122,6 @@ public class LastFMToSpotify {
                     }
                 }
             }
-            }
             api.addItemsToPlaylist(list.getId(), adders.toArray(String[]::new)).build().execute();
             if(configuration.containsKey("playlist.cover")){
                 logLn("Check for \"null\" if setting cover was successful: " + api.uploadCustomPlaylistCoverImage(list.getId()).image_data(configuration.get("playlist.cover")).setHeader("User-Agent", configuration.get("requests.useragent")).build().execute(),3);

src/main/java/de/b00tload/tools/lastfmtospotifyplaylist/arguments/ArgumentHandler.java

@@ -14,6 +14,7 @@ import java.time.LocalDateTime;
 import java.time.format.TextStyle;
 import java.time.temporal.ChronoField;
 import java.time.temporal.WeekFields;
+import java.util.Arrays;
 import java.util.Locale;
 
 import static de.b00tload.tools.lastfmtospotifyplaylist.LastFMToSpotify.LINE_SEPERATOR;
@@ -52,23 +53,43 @@ public class ArgumentHandler {
         // check if all required arguments are given
         Arguments[] required = {Arguments.SECRET, Arguments.CLIENT, Arguments.TOKEN, Arguments.USER};
         for (Arguments argument : required) {
-            boolean found = false;
+            boolean found = List.of(args).contains("--" + argument.getName());
             // check all aliases
             for (String alias : argument.getAliases()) {
                 // if one alias is found check next argument
-                if (List.of(args).contains(alias)) {
+                if (List.of(args).contains("-"+alias)) {
                     found = true;
                     break;
                 }
             }
             // else return false
             if (!found) {
+                logLn("Missing required argument " + argument.getName(), 1);
                 return false;
             }
         }
         return true;
     }
 
+    public static boolean checkExclusivity(String[] args){
+        Arguments[][] exclusive = {{Arguments.PUBLIC, Arguments.COLLABORATIVE}, {Arguments.WEEKLY, Arguments.MONTHLY, Arguments.QUARTERLY, Arguments.BIANNUALLY, Arguments.YEARLY}};
+        for(Arguments[] arguments : exclusive){
+            int count = 0;
+            for(Arguments argument : arguments){
+                if(List.of(args).contains("--"+argument.getName())) count++;
+                for(String alias : argument.getAliases()) {
+                    if(List.of(args).contains("-"+alias)) count++;
+                }
+                if(count>1){
+                    logLn("You may only use one flag out of every exclusive group." + LINE_SEPERATOR +
+                            "This exclusive group contains of: " + Arrays.toString(arguments), 1);
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     private static void help(String value) {
         if (value == null || value.isEmpty()) {
             logLn("This is a list of all available commands. For more specific help on the argument run --help <argument>.", 1);

src/main/java/de/b00tload/tools/lastfmtospotifyplaylist/arguments/Arguments.java

@@ -91,4 +91,15 @@ public enum Arguments {
         ret = getByAlias(v);
         return ret;
     }
+
+    @Override
+    public String toString() {
+        StringBuilder args = new StringBuilder("--").append(this.name).append(" (");
+        for(String alias : this.getAliases()){
+            args.append("-").append(alias).append(", ");
+        }
+        args.delete(args.length()-2, args.length());
+        args.append(")");
+        return args.toString();
+    }
 }