X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=e48f4f53ec7ab7d1951ea4760cacdb64afbccc51;hb=bf9c483d826523d68ab6b2dfc9e77b515813c09c;hp=7be305a0977abc17c0fd227f10d1f18c97dca70a;hpb=d00a4a038876ff303af993d5c1c059938d6feac1;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 7be305a..e48f4f5 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -19,6 +19,7 @@ import be.nikiroo.fanfix.library.CacheLibrary;
 import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.library.RemoteLibrary;
 import be.nikiroo.fanfix.library.RemoteLibraryServer;
+import be.nikiroo.fanfix.library.WebLibrary;
 import be.nikiroo.fanfix.library.WebLibraryServer;
 import be.nikiroo.fanfix.output.BasicOutput;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
@@ -351,7 +352,14 @@ public class Main {
 				} else if (port == null) {
 					port = Integer.parseInt(args[i]);
 
-					BasicLibrary lib = new RemoteLibrary(key, host, port);
+					BasicLibrary lib;
+					if (host.startsWith("http://")
+							|| host.startsWith("https://")) {
+						lib = new WebLibrary(key, host, port);
+					} else {
+						lib = new RemoteLibrary(key, host, port);
+					}
+					
 					lib = new CacheLibrary(
 							Instance.getInstance().getRemoteDir(host), lib,
 							Instance.getInstance().getUiConfig());
@@ -1070,10 +1078,13 @@ public class Main {
 	 * @throws SSLException
 	 *             when the key was not accepted
 	 */
-	private void stopServer(
-			String key, String host, Integer port)
+	private void stopServer(String key, String host, Integer port)
 			throws IOException, SSLException {
-		new RemoteLibrary(key, host, port).exit();
+		if (host.startsWith("http://") || host.startsWith("https://")) {
+			new WebLibrary(key, host, port).stop();
+		} else {
+			new RemoteLibrary(key, host, port).stop();
+		}
 	}
 
 	/**