X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=813a9b40320758e42a4244778b5c86971cc95137;hb=778d8d85f288c7b67c1a5156e5aedfc944997be0;hp=c17a1d8b988f0a52c7c763efd9bad67f48bebd92;hpb=e604986c4208da0091d26bc0e1c4feb4ff3c588f;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index c17a1d8..813a9b4 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -4,10 +4,14 @@ import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.List;
import be.nikiroo.fanfix.bundles.StringId;
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;
import be.nikiroo.fanfix.library.LocalLibrary;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.fanfix.library.RemoteLibraryServer;
@@ -20,6 +24,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 +34,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 +64,10 @@ public class Main {
*
--set-reader [reader type]: set the reader type to CLI, TUI or LOCAL
* for this command
* --version: get the version of the program
- * --server [port]: start a server on this port
- * --remote [host] [port]: use a the given remote library
+ * --server [key] [port]: start a server on this port
+ * --stop-server [key] [port]: stop the running server on this port if
+ * any
+ * --remote [key] [host] [port]: use a the given remote library
*
*
* @param args
@@ -72,6 +79,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 +182,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 +327,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;
@@ -400,7 +441,18 @@ public class Main {
* @return the exit return code (0 = success)
*/
private static int list(String source) {
- BasicReader.getReader().browse(source);
+ List stories;
+ stories = BasicReader.getReader().getLibrary().getListBySource(source);
+
+ for (MetaData story : stories) {
+ String author = "";
+ if (story.getAuthor() != null && !story.getAuthor().isEmpty()) {
+ author = " (" + story.getAuthor() + ")";
+ }
+
+ System.out.println(story.getLuid() + ": " + story.getTitle()
+ + author);
+ }
return 0;
}