X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=b3633612713996f8651bffda5f480fc2607b54be;hb=d0cad92991db43c8d8d00e9fe6bce349e0bbd780;hp=995251d16d0ee7ca6a0438ce21c8268efa6c51cc;hpb=8141d7ac9891898b77a355bfa152de9f3dd76e7e;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 995251d..b363361 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -7,9 +7,11 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import javax.net.ssl.SSLException;
+
+import be.nikiroo.fanfix.bundles.Config;
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;
@@ -76,9 +78,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 [key] [port]: start a server on this port
- * --stop-server [key] [port]: stop the running server on this port if
- * any
+ * --server: start the server mode (see config file for parameters)
+ * --stop-server: stop the running server on this port if any
* --remote [key] [host] [port]: use a the given remote library
*
*
@@ -86,6 +87,9 @@ public class Main {
* see method description
*/
public static void main(String[] args) {
+ // Only one line, but very important:
+ Instance.init();
+
String urlString = null;
String luid = null;
String sourceString = null;
@@ -326,14 +330,10 @@ public class Main {
exitCode = 255; // no arguments for this option
break;
case SERVER:
+ exitCode = 255; // no arguments for this option
+ break;
case STOP_SERVER:
- if (key == null) {
- key = args[i];
- } else if (port == null) {
- port = Integer.parseInt(args[i]);
- } else {
- exitCode = 255;
- }
+ exitCode = 255; // no arguments for this option
break;
case REMOTE:
if (key == null) {
@@ -568,11 +568,19 @@ public class Main {
exitCode = 10;
break;
}
- BasicReader.getReader().browse(null);
+ try {
+ BasicReader.getReader().browse(null);
+ } catch (IOException e) {
+ Instance.getTraceHandler().error(e);
+ exitCode = 66;
+ }
break;
case SERVER:
+ key = Instance.getConfig().getString(Config.SERVER_KEY);
+ port = Instance.getConfig().getInteger(Config.SERVER_PORT);
if (port == null) {
- exitCode = 255;
+ System.err.println("No port configured in the config file");
+ exitCode = 15;
break;
}
try {
@@ -584,12 +592,24 @@ public class Main {
}
return;
case STOP_SERVER:
+ key = Instance.getConfig().getString(Config.SERVER_KEY);
+ port = Instance.getConfig().getInteger(Config.SERVER_PORT);
if (port == null) {
- exitCode = 255;
+ System.err.println("No port configured in the config file");
+ exitCode = 15;
break;
}
+ try {
+ new RemoteLibrary(key, host, port).exit();
+ } catch (SSLException e) {
+ Instance.getTraceHandler().error(
+ "Bad access key for remote library");
+ exitCode = 43;
+ } catch (IOException e) {
+ Instance.getTraceHandler().error(e);
+ exitCode = 44;
+ }
- new RemoteLibrary(key, host, port).exit();
break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
@@ -681,18 +701,14 @@ public class Main {
* @return the exit return code (0 = success)
*/
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);
+ BasicReader.setDefaultReaderType(ReaderType.CLI);
+ try {
+ BasicReader.getReader().browse(source);
+ } catch (IOException e) {
+ Instance.getTraceHandler().error(e);
+ return 66;
}
+
return 0;
}