From 5e848e6a19a87f4e14b13147f628667376503d74 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 26 Nov 2017 17:43:39 +0100 Subject: [PATCH] Remote: new command "EXIT" --- src/be/nikiroo/fanfix/Main.java | 30 +++++++++++++++++-- .../fanfix/bundles/resources.properties | 1 + .../fanfix/library/RemoteLibraryServer.java | 3 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java index 69a7a7c3..6a8a4a5a 100644 --- a/src/be/nikiroo/fanfix/Main.java +++ b/src/be/nikiroo/fanfix/Main.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import be.nikiroo.fanfix.bundles.Config; import be.nikiroo.fanfix.bundles.StringId; import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.Story; @@ -23,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; /** @@ -32,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, } /** @@ -63,6 +63,7 @@ public class Main { * for this command *
  • --version: get the version of the program
  • *
  • --server [port]: start a server on this port
  • + *
  • --stop-server [port]: stop the running server on this port if any
  • *
  • --remote [host] [port]: use a the given remote library
  • * * @@ -177,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 { @@ -194,7 +196,7 @@ public class Main { lib = new CacheLibrary(remoteCacheDir, lib); BasicReader.setDefaultLibrary(lib); - + action = MainAction.START; } else { exitCode = 255; @@ -324,6 +326,28 @@ 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; // should not be reachable (REMOTE -> START) break; diff --git a/src/be/nikiroo/fanfix/bundles/resources.properties b/src/be/nikiroo/fanfix/bundles/resources.properties index 8d6bb1a7..fba6355a 100644 --- a/src/be/nikiroo/fanfix/bundles/resources.properties +++ b/src/be/nikiroo/fanfix/bundles/resources.properties @@ -20,6 +20,7 @@ HELP_SYNTAX = Valid options:\n\ \t--set-reader [reader type]: set the reader type to CLI, TUI or GUI for \n\ \t\tthis command\n\ \t--server [port]: start a remote server on this port\n\ +\t--stop-server [port]: stop the remote server running on this port if any\n\ \t--remote [host] [port]: select this remote server to get \n\ \t\t(or update or...) the stories from\n\ \t--help: this help message\n\ diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index 8c836ed0..1fe182b8 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -27,6 +27,7 @@ import be.nikiroo.utils.serial.Server; *
  • GET_SOURCE_COVER [source]: return the cover for this source
  • *
  • SET_SOURCE_COVER [source], [luid]: set the default cover for the given * source to the cover of the story denoted by luid
  • + *
  • EXIT: stop the server
  • * * * @author niki @@ -87,6 +88,8 @@ public class RemoteLibraryServer extends Server { return Instance.getLibrary().getSourceCover("" + args[1]); } else if ("SET_SOURCE_COVER".equals(command)) { Instance.getLibrary().setSourceCover("" + args[1], "" + args[2]); + } else if ("EXIT".equals(command)) { + stop(0, false); } return null; -- 2.27.0