X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=a05df434fb81fdf8edbc57ce391ec78de940678b;hb=68e2c6d20049d713de1bd31b749450b2f60d8340;hp=5cd3313897317d7fb5a03c73c17557ff421ae890;hpb=c1873e5678fabf306915c54f9c1736e03e027d60;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 5cd3313..a05df43 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -16,7 +16,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.ui.UIUtils;
+import be.nikiroo.utils.serial.Server;
/**
* Main program entry point.
@@ -25,7 +25,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, REMOTE,
}
/**
@@ -55,6 +55,8 @@ 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
*
*
* @param args
@@ -63,11 +65,13 @@ 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;
MainAction action = MainAction.START;
Boolean plusInfo = null;
+ String host = null;
+ Integer port = null;
boolean noMoreActions = false;
@@ -102,8 +106,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 +117,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 +132,8 @@ public class Main {
}
break;
case LIST:
- if (typeString == null) {
- typeString = args[i];
+ if (sourceString == null) {
+ sourceString = args[i];
} else {
exitCode = 255;
}
@@ -164,6 +168,26 @@ public class Main {
break;
case VERSION:
exitCode = 255; // no arguments for this option
+ break;
+ case SERVER:
+ if (port == null) {
+ port = Integer.parseInt(args[i]);
+ } else {
+ exitCode = 255;
+ }
+ break;
+ case REMOTE:
+ if (host == null) {
+ host = args[i];
+ } else if (port == null) {
+ port = Integer.parseInt(args[i]);
+ BasicReader
+ .setDefaultLibrary(new RemoteLibrary(host, port));
+ action = MainAction.START;
+ } else {
+ exitCode = 255;
+ }
+ break;
}
}
@@ -215,16 +239,16 @@ 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);
+ exitCode = list(sourceString);
break;
case READ:
exitCode = read(luid, chapString, true);
@@ -237,6 +261,7 @@ public class Main {
exitCode = 0;
break;
case SET_READER:
+ exitCode = 255;
break;
case VERSION:
System.out
@@ -247,8 +272,23 @@ public class Main {
updates.ok(); // we consider it read
break;
case START:
- //BasicReader.setDefaultReaderType(ReaderType.LOCAL);
- BasicReader.getReader().start(null);
+ BasicReader.getReader().browse(null);
+ break;
+ case SERVER:
+ if (port == null) {
+ exitCode = 255;
+ break;
+ }
+ try {
+ Server server = new RemoteLibraryServer(port);
+ server.start();
+ System.out.println("Remote server started on: " + port);
+ } catch (IOException e) {
+ Instance.syserr(e);
+ }
+ return;
+ case REMOTE:
+ exitCode = 255;
break;
}
}
@@ -263,7 +303,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
@@ -287,7 +327,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
@@ -320,17 +361,17 @@ 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) {
+ BasicReader.getReader().browse(source);
return 0;
}
@@ -338,8 +379,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