Main classes are ready

Author: devgianlu

api/src/main/java/xyz/gianlu/librespot/api/Main.java

@@ -16,9 +16,7 @@
 public class Main {
 
     public static void main(String[] args) throws IOException, GeneralSecurityException, MercuryClient.PubSubException, SpotifyIrc.IrcException, Session.SpotifyAuthenticationException {
-        Session session = new Session.Builder(new FileConfiguration(new File("conf.properties")))
-                .userPass(args[0], args[1])
-                .create();
+        Session session = new Session.Builder(new FileConfiguration(new File("conf.properties"), args)).create();
 
         ApiServer server = new ApiServer(24879);
         server.registerHandler(new PlayerHandler(session));

api/src/main/java/xyz/gianlu/librespot/api/server/ApiServer.java

@@ -24,6 +24,8 @@ public class ApiServer implements Receiver {
 
     public ApiServer(int port) throws IOException {
         server = new WebsocketServer(port, this);
+
+        LOGGER.info(String.format("Server started on port %d!", port));
     }
 
     private static boolean validateVersion(@NotNull JsonObject obj) {

conf.properties

@@ -3,11 +3,11 @@ deviceName=librespot-java
 ## Device type (Computer, Tablet, Smartphone, Speaker, TV, AVR, STB, AudioDongle, Unknown)
 deviceType=Computer
 # Authentication
-## Strategy (userPass, zeroconf, blob, facebook)
+## Strategy (USER_PASS, ZEROCONF, BLOB, FACEBOOK)
 auth.strategy=zeroconf
-## Spotify username (blob, userPass)
+## Spotify username (BLOB, USER_PASS)
 auth.username=
-## Spotify password (userPass)
+## Spotify password (USER_PASS)
 auth.password=
-## Spotify authentication blob (blob)
+## Spotify authentication blob (BLOB)
 auth.blob=

core/src/main/java/xyz/gianlu/librespot/FileConfiguration.java

@@ -1,8 +1,10 @@
 package xyz.gianlu.librespot;
 
+import org.apache.log4j.Logger;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.player.TrackHandler;
 
@@ -15,12 +17,31 @@
  * @author Gianlu
  */
 public final class FileConfiguration extends AbsConfiguration {
+    private static final Logger LOGGER = Logger.getLogger(FileConfiguration.class);
     private final Properties properties;
     private final DefaultConfiguration defaults = new DefaultConfiguration();
 
-    public FileConfiguration(@NotNull File file) throws IOException {
+    public FileConfiguration(@NotNull File file, @Nullable String[] override) throws IOException {
         this.properties = new Properties();
         this.properties.load(new FileReader(file));
+
+        if (override != null && override.length > 0) {
+            for (String str : override) {
+                if (str == null) continue;
+
+                if (str.contains("=") && str.startsWith("--")) {
+                    String[] split = Utils.split(str, '=');
+                    if (split.length != 2) {
+                        LOGGER.warn("Invalid command line argument: " + str);
+                        continue;
+                    }
+
+                    properties.setProperty(split[0].substring(2), split[1]);
+                } else {
+                    LOGGER.warn("Invalid command line argument: " + str);
+                }
+            }
+        }
     }
 
     private boolean getBoolean(@NotNull String key, boolean fallback) {

core/src/main/java/xyz/gianlu/librespot/Main.java

@@ -14,13 +14,6 @@
 public class Main {
 
     public static void main(String[] args) throws IOException, GeneralSecurityException, Session.SpotifyAuthenticationException, SpotifyIrc.IrcException, MercuryClient.PubSubException {
-        Session session = new Session.Builder(new FileConfiguration(new File("conf.properties")))
-                // .facebook()
-                // .zeroconf()
-                .userPass(args[0], args[1])
-                // .blob("username", new byte[] {...})
-                .create();
-
-        ConsoleClient.start(session);
+        new Session.Builder(new FileConfiguration(new File("conf.properties"), args)).create();
     }
 }