X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=f8c0ca25f486b3d0f082bf0874cd6689d26bf42b;hp=995251d16d0ee7ca6a0438ce21c8268efa6c51cc;hb=fb25273cf02653ac343d5437083b1bc41af5ce23;hpb=67837328c9ded45b23691e2a3ebdb29c75f157f2

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 995251d..f8c0ca2 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -7,6 +7,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
@@ -76,9 +77,8 @@ public class Main {
 	 * <li>--set-reader [reader type]: set the reader type to CLI, TUI or LOCAL
 	 * for this command</li>
 	 * <li>--version: get the version of the program</li>
-	 * <li>--server [key] [port]: start a server on this port</li>
-	 * <li>--stop-server [key] [port]: stop the running server on this port if
-	 * any</li>
+	 * <li>--server: start the server mode (see config file for parameters)</li>
+	 * <li>--stop-server: stop the running server on this port if any</li>
 	 * <li>--remote [key] [host] [port]: use a the given remote library</li>
 	 * </ul>
 	 * 
@@ -326,14 +326,10 @@ public class Main {
 				exitCode = 255; // no arguments for this option
 				break;
 			case SERVER:
+				exitCode = 255; // no arguments for this option
+				break;
 			case STOP_SERVER:
-				if (key == null) {
-					key = args[i];
-				} else if (port == null) {
-					port = Integer.parseInt(args[i]);
-				} else {
-					exitCode = 255;
-				}
+				exitCode = 255; // no arguments for this option
 				break;
 			case REMOTE:
 				if (key == null) {
@@ -571,8 +567,11 @@ public class Main {
 				BasicReader.getReader().browse(null);
 				break;
 			case SERVER:
+				key = Instance.getConfig().getString(Config.SERVER_KEY);
+				port = Instance.getConfig().getInteger(Config.SERVER_PORT);
 				if (port == null) {
-					exitCode = 255;
+					System.err.println("No port configured in the config file");
+					exitCode = 15;
 					break;
 				}
 				try {
@@ -584,8 +583,11 @@ public class Main {
 				}
 				return;
 			case STOP_SERVER:
+				key = Instance.getConfig().getString(Config.SERVER_KEY);
+				port = Instance.getConfig().getInteger(Config.SERVER_PORT);
 				if (port == null) {
-					exitCode = 255;
+					System.err.println("No port configured in the config file");
+					exitCode = 15;
 					break;
 				}