allow --remote on --stop-server

[nikiroo-utils.git] / src / be / nikiroo / fanfix / Main.java

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index b3633612713996f8651bffda5f480fc2607b54be..6f77e443bebdab359bbf2589f2e89cb35c925f4d 100644 (file)
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -10,8 +10,11 @@ import java.util.List;
 import javax.net.ssl.SSLException;
 
 import be.nikiroo.fanfix.bundles.Config;
+import be.nikiroo.fanfix.bundles.ConfigBundle;
 import be.nikiroo.fanfix.bundles.StringId;
+import be.nikiroo.fanfix.bundles.StringIdBundle;
 import be.nikiroo.fanfix.data.Chapter;
+import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.library.BasicLibrary;
 import be.nikiroo.fanfix.library.CacheLibrary;
@@ -28,6 +31,8 @@ import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
+import be.nikiroo.utils.resources.Bundles;
+import be.nikiroo.utils.resources.TransBundle;
 import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
@@ -592,10 +597,14 @@ public class Main {
                                }
                                return;
                        case STOP_SERVER:
-                               key = Instance.getConfig().getString(Config.SERVER_KEY);
-                               port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+                               // Can be given via "--remote XX XX XX"
+                               if (key == null)
+                                       key = Instance.getConfig().getString(Config.SERVER_KEY);
+                               if (port == null)
+                                       port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+
                                if (port == null) {
-                                       System.err.println("No port configured in the config file");
+                                       System.err.println("No port given nor configured in the config file");
                                        exitCode = 15;
                                        break;
                                }
@@ -644,10 +653,10 @@ public class Main {
         */
        public static int imprt(String urlString, Progress pg) {
                try {
-                       Story story = Instance.getLibrary().imprt(
+                       MetaData meta = Instance.getLibrary().imprt(
                                        BasicReader.getUrl(urlString), pg);
-                       System.out.println(story.getMeta().getLuid() + ": \""
-                                       + story.getMeta().getTitle() + "\" imported.");
+                       System.out.println(meta.getLuid() + ": \"" + meta.getTitle()
+                                       + "\" imported.");
                } catch (IOException e) {
                        Instance.getTraceHandler().error(e);
                        return 1;
@@ -783,7 +792,7 @@ public class Main {
                try {
                        URL source = BasicReader.getUrl(urlString);
                        sourceName = source.toString();
-                       if (source.toString().startsWith("file://")) {
+                       if (sourceName.startsWith("file://")) {
                                sourceName = sourceName.substring("file://".length());
                        }