X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=813a9b40320758e42a4244778b5c86971cc95137;hb=f569d249d96479f9da73e0b37d3f543fa41eeadc;hp=38f58af3814fcc484f966112af59ec4f96618129;hpb=b0e88ebd20f8b2950c382694e936da76ac3596b6;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java index 38f58af..813a9b4 100644 --- a/src/be/nikiroo/fanfix/Main.java +++ b/src/be/nikiroo/fanfix/Main.java @@ -4,18 +4,27 @@ 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; import be.nikiroo.fanfix.output.BasicOutput; import be.nikiroo.fanfix.output.BasicOutput.OutputType; import be.nikiroo.fanfix.reader.BasicReader; -import be.nikiroo.fanfix.reader.BasicReader.ReaderType; +import be.nikiroo.fanfix.reader.Reader; +import be.nikiroo.fanfix.reader.Reader.ReaderType; 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; /** @@ -25,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, } /** @@ -55,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 @@ -68,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; @@ -170,23 +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]); - try { - BasicReader.setDefaultLibrary(new RemoteLibrary(host, - port)); - } catch (IOException e) { - Instance.syserr(e); - } + + 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; @@ -199,6 +217,7 @@ public class Main { mainProgress.addProgressListener(new Progress.ProgressListener() { private int current = mainProgress.getMin(); + @Override public void progress(Progress progress, String name) { int diff = progress.getProgress() - current; current += diff; @@ -252,12 +271,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: @@ -276,6 +313,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: @@ -284,15 +327,38 @@ 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; + exitCode = 255; // should not be reachable (REMOTE -> START) break; } } @@ -307,7 +373,7 @@ public class Main { } /** - * Import the given resource into the {@link Library}. + * Import the given resource into the {@link LocalLibrary}. * * @param urlString * the resource to import @@ -331,7 +397,8 @@ public class Main { } /** - * Export the {@link Story} from the {@link Library} to the given target. + * Export the {@link Story} from the {@link LocalLibrary} to the given + * target. * * @param luid * the story LUID @@ -346,7 +413,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))); @@ -364,8 +431,8 @@ public class Main { } /** - * List the stories of the given source from the {@link Library} (unless - * NULL is passed, in which case all stories will be listed). + * List the stories of the given source from the {@link LocalLibrary} + * (unless NULL is passed, in which case all stories will be listed). * * @param source * the source to list the known stories of, or NULL to list all @@ -374,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; } @@ -382,8 +460,8 @@ public class Main { * Start the CLI reader for this {@link Story}. * * @param story - * the LUID of the {@link Story} in the {@link Library} or - * the {@link Story} {@link URL} + * the LUID of the {@link Story} in the {@link LocalLibrary} + * or the {@link Story} {@link URL} * @param chapString * which {@link Chapter} to read (starting at 1), or NULL to get * the {@link Story} description @@ -395,16 +473,17 @@ public class Main { */ private static int read(String story, String chapString, boolean library) { try { - BasicReader reader = BasicReader.getReader(); + Reader reader = BasicReader.getReader(); if (library) { - reader.setStory(story, null); + reader.setMeta(story); } else { - reader.setStory(BasicReader.getUrl(story), null); + reader.setMeta(BasicReader.getUrl(story), null); } if (chapString != null) { try { - reader.read(Integer.parseInt(chapString)); + reader.setChapter(Integer.parseInt(chapString)); + reader.read(); } catch (NumberFormatException e) { Instance.syserr(new IOException( "Chapter number cannot be parsed: " + chapString, e)); @@ -450,7 +529,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)));