X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=f413a2d66e95ce296d8d7d1388103b98c41e7722;hb=312e756ed0306e3287f1bf111a5fab9027d46a92;hp=5cd3313897317d7fb5a03c73c17557ff421ae890;hpb=c1873e5678fabf306915c54f9c1736e03e027d60;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 5cd3313..f413a2d 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -4,19 +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.ui.UIUtils;
+import be.nikiroo.utils.serial.server.ServerObject;
/**
* Main program entry point.
@@ -25,7 +33,7 @@ import be.nikiroo.utils.ui.UIUtils;
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION,
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE,
}
/**
@@ -55,6 +63,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 [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
@@ -63,11 +75,14 @@ public class Main {
public static void main(String[] args) {
String urlString = null;
String luid = null;
- String typeString = null;
+ String sourceString = null;
String chapString = null;
String target = null;
+ String key = null;
MainAction action = MainAction.START;
Boolean plusInfo = null;
+ String host = null;
+ Integer port = null;
boolean noMoreActions = false;
@@ -82,8 +97,9 @@ public class Main {
action = MainAction.valueOf(args[i].substring(2)
.toUpperCase().replace("-", "_"));
} catch (Exception e) {
- Instance.syserr(new IllegalArgumentException(
- "Unknown action: " + args[i], e));
+ Instance.getTraceHandler().error(
+ new IllegalArgumentException("Unknown action: "
+ + args[i], e));
exitCode = 255;
}
}
@@ -102,8 +118,8 @@ public class Main {
case EXPORT:
if (luid == null) {
luid = args[i];
- } else if (typeString == null) {
- typeString = args[i];
+ } else if (sourceString == null) {
+ sourceString = args[i];
} else if (target == null) {
target = args[i];
} else {
@@ -113,8 +129,8 @@ public class Main {
case CONVERT:
if (urlString == null) {
urlString = args[i];
- } else if (typeString == null) {
- typeString = args[i];
+ } else if (sourceString == null) {
+ sourceString = args[i];
} else if (target == null) {
target = args[i];
} else if (plusInfo == null) {
@@ -128,8 +144,8 @@ public class Main {
}
break;
case LIST:
- if (typeString == null) {
- typeString = args[i];
+ if (sourceString == null) {
+ sourceString = args[i];
} else {
exitCode = 255;
}
@@ -164,6 +180,35 @@ public class Main {
break;
case VERSION:
exitCode = 255; // no arguments for this option
+ break;
+ case SERVER:
+ 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 (key == null) {
+ key = args[i];
+ } else if (host == null) {
+ host = args[i];
+ } else if (port == null) {
+ port = Integer.parseInt(args[i]);
+
+ BasicLibrary lib = new RemoteLibrary(key, host, port);
+ lib = new CacheLibrary(Instance.getRemoteDir(host), lib);
+
+ BasicReader.setDefaultLibrary(lib);
+
+ action = MainAction.START;
+ } else {
+ exitCode = 255;
+ }
+ break;
}
}
@@ -171,6 +216,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;
@@ -215,21 +261,42 @@ public class Main {
updates.ok(); // we consider it read
break;
case EXPORT:
- exitCode = export(luid, typeString, target, pg);
+ exitCode = export(luid, sourceString, target, pg);
updates.ok(); // we consider it read
break;
case CONVERT:
- exitCode = convert(urlString, typeString, target,
+ exitCode = convert(urlString, sourceString, target,
plusInfo == null ? false : plusInfo, pg);
updates.ok(); // we consider it read
break;
case LIST:
- exitCode = list(typeString);
+ if (BasicReader.getReader() == null) {
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
+ exitCode = 10;
+ break;
+ }
+ exitCode = list(sourceString);
break;
case READ:
+ if (BasicReader.getReader() == null) {
+ Instance.getTraceHandler()
+ .error(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.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
+ exitCode = 10;
+ break;
+ }
exitCode = read(urlString, chapString, false);
break;
case HELP:
@@ -237,6 +304,7 @@ public class Main {
exitCode = 0;
break;
case SET_READER:
+ exitCode = 255;
break;
case VERSION:
System.out
@@ -247,8 +315,38 @@ public class Main {
updates.ok(); // we consider it read
break;
case START:
- //BasicReader.setDefaultReaderType(ReaderType.LOCAL);
- BasicReader.getReader().start(null);
+ if (BasicReader.getReader() == null) {
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
+ exitCode = 10;
+ break;
+ }
+ BasicReader.getReader().browse(null);
+ break;
+ case SERVER:
+ if (port == null) {
+ exitCode = 255;
+ break;
+ }
+ try {
+ ServerObject server = new RemoteLibraryServer(key, port);
+ server.setTraceHandler(Instance.getTraceHandler());
+ server.run();
+ } catch (IOException e) {
+ Instance.getTraceHandler().error(e);
+ }
+ return;
+ case STOP_SERVER:
+ if (port == null) {
+ exitCode = 255;
+ break;
+ }
+
+ new RemoteLibrary(key, host, port).exit();
+ break;
+ case REMOTE:
+ exitCode = 255; // should not be reachable (REMOTE -> START)
break;
}
}
@@ -263,7 +361,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
@@ -279,7 +377,7 @@ public class Main {
System.out.println(story.getMeta().getLuid() + ": \""
+ story.getMeta().getTitle() + "\" imported.");
} catch (IOException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
return 1;
}
@@ -287,7 +385,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
@@ -302,17 +401,17 @@ 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)));
+ Instance.getTraceHandler().error(
+ new Exception(trans(StringId.OUTPUT_DESC, typeString)));
return 1;
}
try {
Instance.getLibrary().export(luid, type, target, pg);
} catch (IOException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
return 4;
}
@@ -320,17 +419,28 @@ public class Main {
}
/**
- * List the stories of the given type 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 type
- * the type to list the known stories of, or NULL to list all
+ * @param source
+ * the source to list the known stories of, or NULL to list all
* stories
*
* @return the exit return code (0 = success)
*/
- private static int list(String type) {
- BasicReader.getReader().start(type);
+ private static int list(String 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;
}
@@ -338,8 +448,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
@@ -351,26 +461,28 @@ 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));
+ Instance.getTraceHandler().error(
+ new IOException("Chapter number cannot be parsed: "
+ + chapString, e));
return 2;
}
} else {
reader.read();
}
} catch (IOException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
return 1;
}
@@ -406,10 +518,11 @@ 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)));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_BAD_OUTPUT_TYPE,
+ typeString)));
exitCode = 2;
} else {
@@ -428,28 +541,32 @@ public class Main {
Story story = support.process(source, pgIn);
try {
target = new File(target).getAbsolutePath();
- BasicOutput.getOutput(type, infoCover).process(
- story, target, pgOut);
+ BasicOutput.getOutput(type, infoCover, infoCover)
+ .process(story, target, pgOut);
} catch (IOException e) {
- Instance.syserr(new IOException(trans(
- StringId.ERR_SAVING, target), e));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_SAVING,
+ target), e));
exitCode = 5;
}
} else {
- Instance.syserr(new IOException(trans(
- StringId.ERR_NOT_SUPPORTED, source)));
+ Instance.getTraceHandler().error(
+ new IOException(trans(
+ StringId.ERR_NOT_SUPPORTED, source)));
exitCode = 4;
}
} catch (IOException e) {
- Instance.syserr(new IOException(trans(StringId.ERR_LOADING,
- sourceName), e));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_LOADING,
+ sourceName), e));
exitCode = 3;
}
}
} catch (MalformedURLException e) {
- Instance.syserr(new IOException(trans(StringId.ERR_BAD_URL,
- sourceName), e));
+ Instance.getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_BAD_URL,
+ sourceName), e));
exitCode = 1;
}
@@ -515,8 +632,9 @@ public class Main {
BasicReader.setDefaultReaderType(readerType);
return 0;
} catch (IllegalArgumentException e) {
- Instance.syserr(new IOException("Unknown reader type: "
- + readerTypeString, e));
+ Instance.getTraceHandler().error(
+ new IOException("Unknown reader type: " + readerTypeString,
+ e));
return 1;
}
}