Remote: now with a pin code

[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 c17a1d8b988f0a52c7c763efd9bad67f48bebd92..a133de789cf3de776e0a8519ffd1ec5b5d3536f9 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,
        }
 
        /**
@@ -59,8 +62,10 @@ 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 [port]: start a server on this port</li>
-        * <li>--remote [host] [port]: use a the given remote library</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>--remote [key] [host] [port]: use a the given remote library</li>
         * </ul>
         * 
         * @param args
@@ -72,6 +77,7 @@ public class Main {
                String sourceString = null;
                String chapString = null;
                String target = null;
+               String key = null;
                MainAction action = MainAction.START;
                Boolean plusInfo = null;
                String host = null;
@@ -174,19 +180,29 @@ public class Main {
                                exitCode = 255; // no arguments for this option
                                break;
                        case SERVER:
-                               if (port == null) {
+                       case STOP_SERVER:
+                               if (key == null) {
+                                       key = args[i];
+                               } else if (port == null) {
                                        port = Integer.parseInt(args[i]);
                                } else {
                                        exitCode = 255;
                                }
                                break;
                        case REMOTE:
-                               if (host == null) {
+                               if (key == null) {
+                                       key = args[i];
+                               } else if (host == null) {
                                        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(key, host, port);
+                                       lib = new CacheLibrary(remoteCacheDir, lib);
+
+                                       BasicReader.setDefaultLibrary(lib);
+
                                        action = MainAction.START;
                                } else {
                                        exitCode = 255;
@@ -309,13 +325,36 @@ public class Main {
                                        break;
                                }
                                try {
-                                       Server server = new RemoteLibraryServer(port);
+                                       Server server = new RemoteLibraryServer(key, port);
                                        server.start();
                                        System.out.println("Remote server started on: " + port);
                                } catch (IOException e) {
                                        Instance.syserr(e);
                                }
                                return;
+                       case STOP_SERVER:
+                               if (port == null) {
+                                       exitCode = 255;
+                                       break;
+                               }
+
+                               try {
+                                       final String fkey = key;
+                                       new ConnectActionClient(host, port, true) {
+                                               @Override
+                                               public void action(Version serverVersion)
+                                                               throws Exception {
+                                                       try {
+                                                               send(new Object[] { fkey, "EXIT" });
+                                                       } catch (Exception e) {
+                                                               Instance.syserr(e);
+                                                       }
+                                               }
+                                       }.connect();
+                               } catch (IOException e) {
+                                       Instance.syserr(e);
+                               }
+                               break;
                        case REMOTE:
                                exitCode = 255; // should not be reachable (REMOTE -> START)
                                break;