X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=961816a3f63e96afc4611489e5d83d85c9e2898a;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=d5a5debe253fb4a6d570c9791d1e5fbdda57d917;hpb=70ee499b74323435ac7ac7dc8676d42c2e9048db;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index d5a5deb..961816a 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -7,6 +7,9 @@ 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;
@@ -61,11 +64,14 @@ public class Main {
*
* --read-url [URL] ([chapter number]): convert on the fly and read the
* story, without saving it
- * --search WEBSITE [free text] ([page] ([item])): search for the given terms,
- * show the given page (page 0 means "how many page do we have", starts at page 1)
- * --search-tag WEBSITE ([tag 1] [tag2...] ([page] ([item]))): list the known
- * tags or search the stories for the given tag(s), show the given page of results
- * (page 0 means "how many page do we have", starts at page 1)
+ * --search: list the supported websites (where)
+ * --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
+ * --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
@@ -73,9 +79,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
*
*
@@ -83,6 +88,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;
@@ -97,7 +105,7 @@ public class Main {
Integer port = null;
SupportType searchOn = null;
String search = null;
- List tags = new ArrayList();
+ List tags = new ArrayList();
Integer page = null;
Integer item = null;
@@ -114,9 +122,8 @@ public class Main {
action = MainAction.valueOf(args[i].substring(2)
.toUpperCase().replace("-", "_"));
} catch (Exception e) {
- Instance.getTraceHandler().error(
- new IllegalArgumentException("Unknown action: "
- + args[i], e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IllegalArgumentException("Unknown action: " + args[i], e));
exitCode = 255;
}
}
@@ -215,36 +222,38 @@ public class Main {
case SEARCH:
if (searchOn == null) {
searchOn = SupportType.valueOfAllOkUC(args[i]);
-
+
if (searchOn == null) {
- Instance.getTraceHandler().error(
- "Website not known: <" + args[i] + ">");
- exitCode = 255;
+ Instance.getInstance().getTraceHandler().error("Website not known: <" + args[i] + ">");
+ exitCode = 41;
+ break;
}
-
+
if (BasicSearchable.getSearchable(searchOn) == null) {
- Instance.getTraceHandler().error(
- "Website not supported: " + searchOn);
- exitCode = 255;
+ Instance.getInstance().getTraceHandler().error("Website not supported: " + searchOn);
+ exitCode = 42;
+ break;
}
} else if (search == null) {
search = args[i];
- } else if (page == null) {
+ } else if (page != null && page == -1) {
try {
page = Integer.parseInt(args[i]);
- } catch (NumberFormatException e) {
- Instance.getTraceHandler().error(
- new Exception("Incorrect page number: <"
- + args[i] + ">", e));
- exitCode = 255;
+ } catch (Exception e) {
+ page = -2;
}
- } else if (item == null) {
+ } else if (item != null && item == -1) {
try {
item = Integer.parseInt(args[i]);
- } catch (NumberFormatException e) {
- Instance.getTraceHandler().error(
- new Exception("Incorrect item number: <"
- + args[i] + ">", e));
+ } catch (Exception e) {
+ item = -2;
+ }
+ } else if (page == null || item == null) {
+ if (page == null && "page".equals(args[i])) {
+ page = -1;
+ } else if (item == null && "item".equals(args[i])) {
+ item = -1;
+ } else {
exitCode = 255;
}
} else {
@@ -254,20 +263,52 @@ public class Main {
case SEARCH_TAG:
if (searchOn == null) {
searchOn = SupportType.valueOfAllOkUC(args[i]);
-
+
if (searchOn == null) {
- Instance.getTraceHandler().error(
- "Website not known: <" + args[i] + ">");
+ Instance.getInstance().getTraceHandler().error("Website not known: <" + args[i] + ">");
exitCode = 255;
}
-
+
if (BasicSearchable.getSearchable(searchOn) == null) {
- Instance.getTraceHandler().error(
- "Website not supported: " + searchOn);
+ Instance.getInstance().getTraceHandler().error("Website not supported: " + searchOn);
+ exitCode = 255;
+ }
+ } else if (page == null && item == null) {
+ if ("page".equals(args[i])) {
+ page = -1;
+ } else if ("item".equals(args[i])) {
+ item = -1;
+ } else {
+ try {
+ int index = Integer.parseInt(args[i]);
+ tags.add(index);
+ } catch (NumberFormatException e) {
+ Instance.getInstance().getTraceHandler().error("Invalid tag index: " + args[i]);
+ exitCode = 255;
+ }
+ }
+ } else if (page != null && page == -1) {
+ try {
+ page = Integer.parseInt(args[i]);
+ } catch (Exception e) {
+ page = -2;
+ }
+ } else if (item != null && item == -1) {
+ try {
+ item = Integer.parseInt(args[i]);
+ } catch (Exception e) {
+ item = -2;
+ }
+ } else if (page == null || item == null) {
+ if (page == null && "page".equals(args[i])) {
+ page = -1;
+ } else if (item == null && "item".equals(args[i])) {
+ item = -1;
+ } else {
exitCode = 255;
}
} else {
- tags.add(args[i]);
+ exitCode = 255;
}
break;
case HELP:
@@ -284,14 +325,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) {
@@ -302,7 +339,8 @@ public class Main {
port = Integer.parseInt(args[i]);
BasicLibrary lib = new RemoteLibrary(key, host, port);
- lib = new CacheLibrary(Instance.getRemoteDir(host), lib);
+ lib = new CacheLibrary(Instance.getInstance().getRemoteDir(host), lib,
+ Instance.getInstance().getUiConfig());
BasicReader.setDefaultLibrary(lib);
@@ -359,7 +397,7 @@ public class Main {
}
}
- if (exitCode != 255) {
+ if (exitCode == 0) {
switch (action) {
case IMPORT:
exitCode = imprt(urlString, pg);
@@ -376,9 +414,7 @@ public class Main {
break;
case LIST:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
@@ -386,33 +422,31 @@ public class Main {
break;
case SET_SOURCE:
try {
- Instance.getLibrary().changeSource(luid, sourceString, pg);
+ Instance.getInstance().getLibrary().changeSource(luid, sourceString, pg);
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.getInstance().getTraceHandler().error(e1);
exitCode = 21;
}
break;
case SET_TITLE:
try {
- Instance.getLibrary().changeTitle(luid, titleString, pg);
+ Instance.getInstance().getLibrary().changeTitle(luid, titleString, pg);
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.getInstance().getTraceHandler().error(e1);
exitCode = 22;
}
break;
case SET_AUTHOR:
try {
- Instance.getLibrary().changeAuthor(luid, authorString, pg);
+ Instance.getInstance().getLibrary().changeAuthor(luid, authorString, pg);
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.getInstance().getTraceHandler().error(e1);
exitCode = 23;
}
break;
case READ:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
@@ -420,80 +454,82 @@ public class Main {
break;
case READ_URL:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = read(urlString, chapString, false);
break;
case SEARCH:
- if (searchOn == null || search == null) {
+ page = page == null ? 1 : page;
+ if (page < 0) {
+ Instance.getInstance().getTraceHandler().error("Incorrect page number");
exitCode = 255;
break;
}
-
- if (page == null) {
- page = 1;
- }
- if (item == null) {
- item = 0;
+
+ item = item == null ? 0 : item;
+ if (item < 0) {
+ Instance.getInstance().getTraceHandler().error("Incorrect item number");
+ exitCode = 255;
+ break;
}
-
+
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
-
+
try {
- BasicReader.getReader().search(searchOn, search, page, item);
+ if (searchOn == null) {
+ BasicReader.getReader().search(true);
+ } else if (search != null) {
+
+ BasicReader.getReader().search(searchOn, search, page,
+ item, true);
+ } else {
+ exitCode = 255;
+ }
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.getInstance().getTraceHandler().error(e1);
+ exitCode = 20;
}
-
+
break;
case SEARCH_TAG:
if (searchOn == null) {
exitCode = 255;
break;
}
-
- item = 0;
- page = 1;
- try {
- page = Integer.parseInt(tags.get(tags.size()-1));
- tags.remove(tags.size() - 1);
-
- try {
- int tmp = Integer.parseInt(tags.get(tags.size()-1));
- tags.remove(tags.size() - 1);
-
- item = page;
- page = tmp;
- } catch (Exception e) {
- }
- } catch (Exception e) {
+ page = page == null ? 1 : page;
+ if (page < 0) {
+ Instance.getInstance().getTraceHandler().error("Incorrect page number");
+ exitCode = 255;
+ break;
}
-
+
+ item = item == null ? 0 : item;
+ if (item < 0) {
+ Instance.getInstance().getTraceHandler().error("Incorrect item number");
+ exitCode = 255;
+ break;
+ }
+
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
-
+
try {
- BasicReader.getReader().searchTag(searchOn, page, item, tags.toArray(new String[]{}));
+ BasicReader.getReader().searchTag(searchOn, page, item,
+ true, tags.toArray(new Integer[] {}));
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.getInstance().getTraceHandler().error(e1);
}
-
+
break;
case HELP:
syntax(true);
@@ -512,34 +548,56 @@ public class Main {
break;
case START:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
- BasicReader.getReader().browse(null);
+ try {
+ BasicReader.getReader().browse(null);
+ } catch (IOException e) {
+ Instance.getInstance().getTraceHandler().error(e);
+ exitCode = 66;
+ }
break;
case SERVER:
+ key = Instance.getInstance().getConfig().getString(Config.SERVER_KEY);
+ port = Instance.getInstance().getConfig().getInteger(Config.SERVER_PORT);
if (port == null) {
- exitCode = 255;
+ System.err.println("No port configured in the config file");
+ exitCode = 15;
break;
}
try {
ServerObject server = new RemoteLibraryServer(key, port);
- server.setTraceHandler(Instance.getTraceHandler());
+ server.setTraceHandler(Instance.getInstance().getTraceHandler());
server.run();
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
}
return;
case STOP_SERVER:
+ // Can be given via "--remote XX XX XX"
+ if (key == null)
+ key = Instance.getInstance().getConfig().getString(Config.SERVER_KEY);
+ if (port == null)
+ port = Instance.getInstance().getConfig().getInteger(Config.SERVER_PORT);
+
if (port == null) {
- exitCode = 255;
+ System.err.println("No port given nor configured in the config file");
+ exitCode = 15;
break;
}
+ try {
+ new RemoteLibrary(key, host, port).exit();
+ } catch (SSLException e) {
+ Instance.getInstance().getTraceHandler().error(
+ "Bad access key for remote library");
+ exitCode = 43;
+ } catch (IOException e) {
+ Instance.getInstance().getTraceHandler().error(e);
+ exitCode = 44;
+ }
- new RemoteLibrary(key, host, port).exit();
break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
@@ -548,11 +606,9 @@ public class Main {
}
try {
- Instance.getTempFiles().close();
+ Instance.getInstance().getTempFiles().close();
} catch (IOException e) {
- Instance.getTraceHandler()
- .error(new IOException(
- "Cannot dispose of the temporary files", e));
+ Instance.getInstance().getTraceHandler().error(new IOException("Cannot dispose of the temporary files", e));
}
if (exitCode == 255) {
@@ -574,12 +630,10 @@ public class Main {
*/
public static int imprt(String urlString, Progress pg) {
try {
- Story story = Instance.getLibrary().imprt(
- BasicReader.getUrl(urlString), pg);
- System.out.println(story.getMeta().getLuid() + ": \""
- + story.getMeta().getTitle() + "\" imported.");
+ MetaData meta = Instance.getInstance().getLibrary().imprt(BasicReader.getUrl(urlString), pg);
+ System.out.println(meta.getLuid() + ": \"" + meta.getTitle() + "\" imported.");
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
return 1;
}
@@ -605,15 +659,14 @@ public class Main {
Progress pg) {
OutputType type = OutputType.valueOfNullOkUC(typeString, null);
if (type == null) {
- Instance.getTraceHandler().error(
- new Exception(trans(StringId.OUTPUT_DESC, typeString)));
+ Instance.getInstance().getTraceHandler().error(new Exception(trans(StringId.OUTPUT_DESC, typeString)));
return 1;
}
try {
- Instance.getLibrary().export(luid, type, target, pg);
+ Instance.getInstance().getLibrary().export(luid, type, target, pg);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
return 4;
}
@@ -631,18 +684,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.getInstance().getTraceHandler().error(e);
+ return 66;
}
+
return 0;
}
@@ -675,16 +724,15 @@ public class Main {
reader.setChapter(Integer.parseInt(chapString));
reader.read(true);
} catch (NumberFormatException e) {
- Instance.getTraceHandler().error(
- new IOException("Chapter number cannot be parsed: "
- + chapString, e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Chapter number cannot be parsed: " + chapString, e));
return 2;
}
} else {
reader.read(true);
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
return 1;
}
@@ -712,20 +760,19 @@ public class Main {
String target, boolean infoCover, Progress pg) {
int exitCode = 0;
- Instance.getTraceHandler().trace("Convert: " + urlString);
+ Instance.getInstance().getTraceHandler().trace("Convert: " + urlString);
String sourceName = urlString;
try {
URL source = BasicReader.getUrl(urlString);
sourceName = source.toString();
- if (source.toString().startsWith("file://")) {
+ if (sourceName.startsWith("file://")) {
sourceName = sourceName.substring("file://".length());
}
OutputType type = OutputType.valueOfAllOkUC(typeString, null);
if (type == null) {
- Instance.getTraceHandler().error(
- new IOException(trans(StringId.ERR_BAD_OUTPUT_TYPE,
- typeString)));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_BAD_OUTPUT_TYPE, typeString)));
exitCode = 2;
} else {
@@ -733,8 +780,7 @@ public class Main {
BasicSupport support = BasicSupport.getSupport(source);
if (support != null) {
- Instance.getTraceHandler().trace(
- "Support found: " + support.getClass());
+ Instance.getInstance().getTraceHandler().trace("Support found: " + support.getClass());
Progress pgIn = new Progress();
Progress pgOut = new Progress();
if (pg != null) {
@@ -746,32 +792,26 @@ public class Main {
Story story = support.process(pgIn);
try {
target = new File(target).getAbsolutePath();
- BasicOutput.getOutput(type, infoCover, infoCover)
- .process(story, target, pgOut);
+ BasicOutput.getOutput(type, infoCover, infoCover).process(story, target, pgOut);
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException(trans(StringId.ERR_SAVING,
- target), e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_SAVING, target), e));
exitCode = 5;
}
} else {
- Instance.getTraceHandler().error(
- new IOException(trans(
- StringId.ERR_NOT_SUPPORTED, source)));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans( StringId.ERR_NOT_SUPPORTED, source)));
exitCode = 4;
}
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException(trans(StringId.ERR_LOADING,
- sourceName), e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_LOADING, sourceName), e));
exitCode = 3;
}
}
} catch (MalformedURLException e) {
- Instance.getTraceHandler()
- .error(new IOException(trans(StringId.ERR_BAD_URL,
- sourceName), e));
+ Instance.getInstance().getTraceHandler().error(new IOException(trans(StringId.ERR_BAD_URL, sourceName), e));
exitCode = 1;
}
@@ -787,7 +827,7 @@ public class Main {
* @return the translated result
*/
private static String trans(StringId id, Object... params) {
- return Instance.getTrans().getString(id, params);
+ return Instance.getInstance().getTrans().getString(id, params);
}
/**
@@ -837,9 +877,8 @@ public class Main {
BasicReader.setDefaultReaderType(readerType);
return 0;
} catch (IllegalArgumentException e) {
- Instance.getTraceHandler().error(
- new IOException("Unknown reader type: " + readerTypeString,
- e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Unknown reader type: " + readerTypeString, e));
return 1;
}
}