Remote: new command "EXIT"

[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 9ac48845ce87d4bc57416bfd2daf7e7f30fa4364..6a8a4a5af7542dccb07e8ffd5ba97dccd1abb05a 100644 (file)
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -8,6 +8,8 @@ import java.net.URL;
 import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.library.BasicLibrary;
+import be.nikiroo.fanfix.library.CacheLibrary;
 import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.library.RemoteLibrary;
 import be.nikiroo.fanfix.library.RemoteLibraryServer;
@@ -20,6 +22,7 @@ import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
+import be.nikiroo.utils.serial.ConnectActionClient;
 import be.nikiroo.utils.serial.Server;
 
 /**
@@ -29,7 +32,7 @@ import be.nikiroo.utils.serial.Server;
  */
 public class Main {
        private enum MainAction {
-               IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, REMOTE,
+               IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE,
        }
 
        /**
@@ -60,6 +63,7 @@ public class Main {
         * for this command</li>
         * <li>--version: get the version of the program</li>
         * <li>--server [port]: start a server on this port</li>
+        * <li>--stop-server [port]: stop the running server on this port if any</li>
         * <li>--remote [host] [port]: use a the given remote library</li>
         * </ul>
         * 
@@ -174,6 +178,7 @@ public class Main {
                                exitCode = 255; // no arguments for this option
                                break;
                        case SERVER:
+                       case STOP_SERVER:
                                if (port == null) {
                                        port = Integer.parseInt(args[i]);
                                } else {
@@ -185,8 +190,13 @@ public class Main {
                                        host = args[i];
                                } else if (port == null) {
                                        port = Integer.parseInt(args[i]);
-                                       BasicReader
-                                                       .setDefaultLibrary(new RemoteLibrary(host, port));
+
+                                       File remoteCacheDir = Instance.getRemoteDir(host);
+                                       BasicLibrary lib = new RemoteLibrary(host, port);
+                                       lib = new CacheLibrary(remoteCacheDir, lib);
+
+                                       BasicReader.setDefaultLibrary(lib);
+
                                        action = MainAction.START;
                                } else {
                                        exitCode = 255;
@@ -253,12 +263,30 @@ public class Main {
                                updates.ok(); // we consider it read
                                break;
                        case LIST:
+                               if (BasicReader.getReader() == null) {
+                                       Instance.syserr(new Exception(
+                                                       "No reader type has been configured"));
+                                       exitCode = 10;
+                                       break;
+                               }
                                exitCode = list(sourceString);
                                break;
                        case READ:
+                               if (BasicReader.getReader() == null) {
+                                       Instance.syserr(new Exception(
+                                                       "No reader type has been configured"));
+                                       exitCode = 10;
+                                       break;
+                               }
                                exitCode = read(luid, chapString, true);
                                break;
                        case READ_URL:
+                               if (BasicReader.getReader() == null) {
+                                       Instance.syserr(new Exception(
+                                                       "No reader type has been configured"));
+                                       exitCode = 10;
+                                       break;
+                               }
                                exitCode = read(urlString, chapString, false);
                                break;
                        case HELP:
@@ -277,6 +305,12 @@ public class Main {
                                updates.ok(); // we consider it read
                                break;
                        case START:
+                               if (BasicReader.getReader() == null) {
+                                       Instance.syserr(new Exception(
+                                                       "No reader type has been configured"));
+                                       exitCode = 10;
+                                       break;
+                               }
                                BasicReader.getReader().browse(null);
                                break;
                        case SERVER:
@@ -292,8 +326,30 @@ public class Main {
                                        Instance.syserr(e);
                                }
                                return;
+                       case STOP_SERVER:
+                               if (port == null) {
+                                       exitCode = 255;
+                                       break;
+                               }
+
+                               try {
+                                       new ConnectActionClient(host, port, true) {
+                                               @Override
+                                               public void action(Version serverVersion)
+                                                               throws Exception {
+                                                       try {
+                                                               send(new Object[] { "EXIT" });
+                                                       } catch (Exception e) {
+                                                               Instance.syserr(e);
+                                                       }
+                                               }
+                                       }.connect();
+                               } catch (IOException e) {
+                                       Instance.syserr(e);
+                               }
+                               break;
                        case REMOTE:
-                               exitCode = 255;
+                               exitCode = 255; // should not be reachable (REMOTE -> START)
                                break;
                        }
                }
@@ -348,7 +404,7 @@ public class Main {
         */
        public static int export(String luid, String typeString, String target,
                        Progress pg) {
-               OutputType type = OutputType.valueOfNullOkUC(typeString);
+               OutputType type = OutputType.valueOfNullOkUC(typeString, null);
                if (type == null) {
                        Instance.syserr(new Exception(trans(StringId.OUTPUT_DESC,
                                        typeString)));
@@ -453,7 +509,7 @@ public class Main {
                                sourceName = sourceName.substring("file://".length());
                        }
 
-                       OutputType type = OutputType.valueOfAllOkUC(typeString);
+                       OutputType type = OutputType.valueOfAllOkUC(typeString, null);
                        if (type == null) {
                                Instance.syserr(new IOException(trans(
                                                StringId.ERR_BAD_OUTPUT_TYPE, typeString)));