X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=2ed276b1ea335dce6be6ed116b8e7973edd9f0ec;hb=3ddb5591128b1f30dc27c4b58c89dc06c53e5d76;hp=faf882006fccfb0b1e9c8a3774c74802d6b8ee78;hpb=b31a0db030e164bc1d9a8620e71b595dad31adb6;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index faf8820..2ed276b 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -7,7 +7,12 @@ 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.ConfigBundle;
import be.nikiroo.fanfix.bundles.StringId;
+import be.nikiroo.fanfix.bundles.StringIdBundle;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
@@ -26,6 +31,8 @@ import be.nikiroo.fanfix.supported.BasicSupport;
import be.nikiroo.fanfix.supported.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
+import be.nikiroo.utils.resources.Bundles;
+import be.nikiroo.utils.resources.TransBundle;
import be.nikiroo.utils.serial.server.ServerObject;
/**
@@ -35,7 +42,7 @@ import be.nikiroo.utils.serial.server.ServerObject;
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE, SET_SOURCE, SET_TITLE, SET_AUTHOR, SEARCH, TAG
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE, SET_SOURCE, SET_TITLE, SET_AUTHOR, SEARCH, SEARCH_TAG
}
/**
@@ -65,10 +72,10 @@ public class Main {
*
--search [where] [keywords] (page [page]) (item [item]): search on
* the supported website and display the given results page of stories it
* found, or the story details if asked
- * --tag [where]: list all the tags supported by this website
- * --tag [index 1]... (page [page]) (item [item]): search for the given
- * stories or subtags, tag by tag, and display information about a specific
- * page of results or about a specific item if requested
+ * --search-tag [where]: list all the tags supported by this website
+ * --search-tag [index 1]... (page [page]) (item [item]): search for the
+ * given stories or subtags, tag by tag, and display information about a
+ * specific page of results or about a specific item if requested
* --list ([type]): list the stories present in the library
* --set-source [id] [new source]: change the source of the given story
* --set-title [id] [new title]: change the title of the given story
@@ -76,9 +83,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 +92,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;
@@ -258,7 +267,7 @@ public class Main {
exitCode = 255;
}
break;
- case TAG:
+ case SEARCH_TAG:
if (searchOn == null) {
searchOn = SupportType.valueOfAllOkUC(args[i]);
@@ -326,14 +335,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) {
@@ -509,7 +514,7 @@ public class Main {
}
break;
- case TAG:
+ case SEARCH_TAG:
if (searchOn == null) {
exitCode = 255;
break;
@@ -568,11 +573,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 +597,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)
@@ -624,10 +649,10 @@ public class Main {
*/
public static int imprt(String urlString, Progress pg) {
try {
- Story story = Instance.getLibrary().imprt(
+ MetaData meta = Instance.getLibrary().imprt(
BasicReader.getUrl(urlString), pg);
- System.out.println(story.getMeta().getLuid() + ": \""
- + story.getMeta().getTitle() + "\" imported.");
+ System.out.println(meta.getLuid() + ": \"" + meta.getTitle()
+ + "\" imported.");
} catch (IOException e) {
Instance.getTraceHandler().error(e);
return 1;
@@ -681,18 +706,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;
}
@@ -767,7 +788,7 @@ public class Main {
try {
URL source = BasicReader.getUrl(urlString);
sourceName = source.toString();
- if (source.toString().startsWith("file://")) {
+ if (sourceName.startsWith("file://")) {
sourceName = sourceName.substring("file://".length());
}