import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.reader.Reader;
import be.nikiroo.fanfix.reader.Reader.ReaderType;
+import be.nikiroo.fanfix.searchable.BasicSearchable;
import be.nikiroo.fanfix.supported.BasicSupport;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
+import be.nikiroo.fanfix.supported.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.server.ConnectActionClientObject;
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,
+ 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
}
/**
* </li>
* <li>--read-url [URL] ([chapter number]): convert on the fly and read the
* story, without saving it</li>
+ * <li>--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)</li>
+ * <li>--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)</li>
* <li>--list ([type]): list the stories present in the library</li>
+ * <li>--set-source [id] [new source]: change the source of the given story</li>
+ * <li>--set-title [id] [new title]: change the title of the given story</li>
+ * <li>--set-author [id] [new author]: change the author of the given story</li>
* <li>--set-reader [reader type]: set the reader type to CLI, TUI or LOCAL
* for this command</li>
* <li>--version: get the version of the program</li>
String urlString = null;
String luid = null;
String sourceString = null;
+ String titleString = null;
+ String authorString = null;
String chapString = null;
String target = null;
String key = null;
Boolean plusInfo = null;
String host = null;
Integer port = null;
+ SupportType searchOn = null;
+ String search = null;
+ List<String> tags = new ArrayList<String>();
+ Integer page = null;
+ Integer item = null;
boolean noMoreActions = false;
exitCode = 255;
}
break;
+ case SET_SOURCE:
+ if (luid == null) {
+ luid = args[i];
+ } else if (sourceString == null) {
+ sourceString = args[i];
+ } else {
+ exitCode = 255;
+ }
+ break;
+ case SET_TITLE:
+ if (luid == null) {
+ luid = args[i];
+ } else if (sourceString == null) {
+ titleString = args[i];
+ } else {
+ exitCode = 255;
+ }
+ break;
+ case SET_AUTHOR:
+ if (luid == null) {
+ luid = args[i];
+ } else if (sourceString == null) {
+ authorString = args[i];
+ } else {
+ exitCode = 255;
+ }
+ break;
case READ:
if (luid == null) {
luid = args[i];
exitCode = 255;
}
break;
+ case SEARCH:
+ if (searchOn == null) {
+ searchOn = SupportType.valueOfAllOkUC(args[i]);
+
+ if (searchOn == null) {
+ Instance.getTraceHandler().error(
+ "Website not known: <" + args[i] + ">");
+ exitCode = 255;
+ }
+
+ if (BasicSearchable.getSearchable(searchOn) == null) {
+ Instance.getTraceHandler().error(
+ "Website not supported: " + searchOn);
+ exitCode = 255;
+ }
+ } else if (search == null) {
+ search = args[i];
+ } else if (page == null) {
+ try {
+ page = Integer.parseInt(args[i]);
+ } catch (NumberFormatException e) {
+ Instance.getTraceHandler().error(
+ new Exception("Incorrect page number: <"
+ + args[i] + ">", e));
+ exitCode = 255;
+ }
+ } else if (item == null) {
+ try {
+ item = Integer.parseInt(args[i]);
+ } catch (NumberFormatException e) {
+ Instance.getTraceHandler().error(
+ new Exception("Incorrect item number: <"
+ + args[i] + ">", e));
+ exitCode = 255;
+ }
+ } else {
+ exitCode = 255;
+ }
+ break;
+ case SEARCH_TAG:
+ if (searchOn == null) {
+ searchOn = SupportType.valueOfAllOkUC(args[i]);
+
+ if (searchOn == null) {
+ Instance.getTraceHandler().error(
+ "Website not known: <" + args[i] + ">");
+ exitCode = 255;
+ }
+
+ if (BasicSearchable.getSearchable(searchOn) == null) {
+ Instance.getTraceHandler().error(
+ "Website not supported: " + searchOn);
+ exitCode = 255;
+ }
+ } else {
+ tags.add(args[i]);
+ }
+ break;
case HELP:
exitCode = 255;
break;
} else if (port == null) {
port = Integer.parseInt(args[i]);
- File remoteCacheDir = Instance.getRemoteDir(host);
BasicLibrary lib = new RemoteLibrary(key, host, port);
- lib = new CacheLibrary(remoteCacheDir, lib);
+ lib = new CacheLibrary(Instance.getRemoteDir(host), lib);
BasicReader.setDefaultLibrary(lib);
int diff = progress.getProgress() - current;
current += diff;
+ if (diff <= 0)
+ return;
+
StringBuilder builder = new StringBuilder();
for (int i = 0; i < diff; i++) {
builder.append('.');
System.err.println("\tVersion " + v);
System.err.println("\t-------------");
System.err.println("");
- for (String item : updates.getChanges().get(v)) {
- System.err.println("\t- " + item);
+ for (String it : updates.getChanges().get(v)) {
+ System.err.println("\t- " + it);
}
System.err.println("");
}
}
exitCode = list(sourceString);
break;
+ case SET_SOURCE:
+ try {
+ Instance.getLibrary().changeSource(luid, sourceString, pg);
+ } catch (IOException e1) {
+ Instance.getTraceHandler().error(e1);
+ exitCode = 21;
+ }
+ break;
+ case SET_TITLE:
+ try {
+ Instance.getLibrary().changeTitle(luid, titleString, pg);
+ } catch (IOException e1) {
+ Instance.getTraceHandler().error(e1);
+ exitCode = 22;
+ }
+ break;
+ case SET_AUTHOR:
+ try {
+ Instance.getLibrary().changeAuthor(luid, authorString, pg);
+ } catch (IOException e1) {
+ Instance.getTraceHandler().error(e1);
+ exitCode = 23;
+ }
+ break;
case READ:
if (BasicReader.getReader() == null) {
Instance.getTraceHandler()
break;
}
exitCode = read(urlString, chapString, false);
+ break;
+ case SEARCH:
+ if (searchOn == null || search == null) {
+ exitCode = 255;
+ break;
+ }
+
+ if (page == null) {
+ page = 1;
+ }
+ if (item == null) {
+ item = 0;
+ }
+
+ if (BasicReader.getReader() == null) {
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
+ exitCode = 10;
+ break;
+ }
+
+ try {
+ BasicReader.getReader().search(searchOn, search, page, item);
+ } catch (IOException e1) {
+ Instance.getTraceHandler().error(e1);
+ }
+
+ break;
+ case SEARCH_TAG:
+ if (searchOn == null) {
+ exitCode = 255;
+ break;
+ }
+
+ item = 0;
+ page = 1;
+
+ try {
+ item = 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);
+
+ page = item;
+ item = tmp;
+ } catch (Exception e) {
+ }
+ } catch (Exception e) {
+ }
+
+ if (BasicReader.getReader() == null) {
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
+ exitCode = 10;
+ break;
+ }
+
+ try {
+ BasicReader.getReader().searchTag(searchOn, page, item, tags.toArray(new String[]{}));
+ } catch (IOException e1) {
+ Instance.getTraceHandler().error(e1);
+ }
+
break;
case HELP:
syntax(true);
case VERSION:
System.out
.println(String.format("Fanfix version %s"
- + "\nhttps://github.com/nikiroo/fanfix/"
- + "\n\tWritten by Nikiroo",
+ + "%nhttps://github.com/nikiroo/fanfix/"
+ + "%n\tWritten by Nikiroo",
Version.getCurrentVersion()));
updates.ok(); // we consider it read
break;
try {
ServerObject server = new RemoteLibraryServer(key, port);
server.setTraceHandler(Instance.getTraceHandler());
- server.start();
+ server.run();
} catch (IOException e) {
Instance.getTraceHandler().error(e);
}
break;
}
- try {
- final String fkey = key;
- new ConnectActionClientObject(host, port, true) {
- @Override
- public void action(Version serverVersion)
- throws Exception {
- try {
- send(new Object[] { fkey, "EXIT" });
- } catch (Exception e) {
- Instance.getTraceHandler().error(e);
- }
- }
- }.connect();
- } catch (IOException e) {
- Instance.getTraceHandler().error(e);
- }
+ new RemoteLibrary(key, host, port).exit();
break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
}
}
+ try {
+ Instance.getTempFiles().close();
+ } catch (IOException e) {
+ Instance.getTraceHandler()
+ .error(new IOException(
+ "Cannot dispose of the temporary files", e));
+ }
+
if (exitCode == 255) {
syntax(false);
}
- if (exitCode != 0) {
- System.exit(exitCode);
- }
+ System.exit(exitCode);
}
/**
}
/**
- * Start the CLI reader for this {@link Story}.
+ * Start the current reader for this {@link Story}.
*
* @param story
* the LUID of the {@link Story} in the {@link LocalLibrary}
if (chapString != null) {
try {
reader.setChapter(Integer.parseInt(chapString));
- reader.read();
+ reader.read(true);
} catch (NumberFormatException e) {
Instance.getTraceHandler().error(
new IOException("Chapter number cannot be parsed: "
return 2;
}
} else {
- reader.read();
+ reader.read(true);
}
} catch (IOException e) {
Instance.getTraceHandler().error(e);
*
* @return the exit return code (0 = success)
*/
- private static int convert(String urlString, String typeString,
+ public static int convert(String urlString, String typeString,
String target, boolean infoCover, Progress pg) {
int exitCode = 0;
+ Instance.getTraceHandler().trace("Convert: " + urlString);
String sourceName = urlString;
try {
URL source = BasicReader.getUrl(urlString);
BasicSupport support = BasicSupport.getSupport(source);
if (support != null) {
+ Instance.getTraceHandler().trace(
+ "Support found: " + support.getClass());
Progress pgIn = new Progress();
Progress pgOut = new Progress();
if (pg != null) {
pg.addProgress(pgOut, 1);
}
- Story story = support.process(source, pgIn);
+ Story story = support.process(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.getTraceHandler().error(
new IOException(trans(StringId.ERR_SAVING,
git://git.nikiroo.be / fanfix.git / blobdiff