import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.List;
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;
import be.nikiroo.fanfix.library.LocalLibrary;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.fanfix.library.RemoteLibraryServer;
import be.nikiroo.fanfix.reader.Reader;
import be.nikiroo.fanfix.reader.Reader.ReaderType;
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;
+import be.nikiroo.utils.serial.server.ServerObject;
/**
* Main program entry point.
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, REMOTE,
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE,
}
/**
* <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>
- * <li>--server [port]: start a server on this port</li>
- * <li>--remote [host] [port]: use a the given remote library</li>
+ * <li>--server [key] [port]: start a server on this port</li>
+ * <li>--stop-server [key] [port]: stop the running server on this port if
+ * any</li>
+ * <li>--remote [key] [host] [port]: use a the given remote library</li>
* </ul>
*
* @param args
String sourceString = null;
String chapString = null;
String target = null;
+ String key = null;
MainAction action = MainAction.START;
Boolean plusInfo = null;
String host = null;
action = MainAction.valueOf(args[i].substring(2)
.toUpperCase().replace("-", "_"));
} catch (Exception e) {
- Instance.syserr(new IllegalArgumentException(
- "Unknown action: " + args[i], e));
+ Instance.getTraceHandler().error(
+ new IllegalArgumentException("Unknown action: "
+ + args[i], e));
exitCode = 255;
}
}
exitCode = 255; // no arguments for this option
break;
case SERVER:
- if (port == null) {
+ case STOP_SERVER:
+ if (key == null) {
+ key = args[i];
+ } else if (port == null) {
port = Integer.parseInt(args[i]);
} else {
exitCode = 255;
}
break;
case REMOTE:
- if (host == null) {
+ if (key == null) {
+ key = args[i];
+ } else if (host == null) {
host = args[i];
} else if (port == null) {
port = Integer.parseInt(args[i]);
- BasicReader
- .setDefaultLibrary(new RemoteLibrary(host, port));
+
+ BasicLibrary lib = new RemoteLibrary(key, host, port);
+ lib = new CacheLibrary(Instance.getRemoteDir(host), lib);
+
+ BasicReader.setDefaultLibrary(lib);
+
action = MainAction.START;
} else {
exitCode = 255;
break;
case LIST:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
break;
case READ:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
break;
case READ_URL:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
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;
case START:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
break;
}
try {
- Server server = new RemoteLibraryServer(port);
- server.start();
- System.out.println("Remote server started on: " + port);
+ ServerObject server = new RemoteLibraryServer(key, port);
+ server.setTraceHandler(Instance.getTraceHandler());
+ server.run();
} catch (IOException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
}
return;
+ case STOP_SERVER:
+ if (port == null) {
+ exitCode = 255;
+ break;
+ }
+
+ new RemoteLibrary(key, host, port).exit();
+ break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
break;
}
}
+ // We cannot do it when in GUI mode, because it is async...
+ // So if we close the temp files before it is actually used,
+ // we have a problem...
+ // TODO: close it at the correct time (for now, finalize try to do it)
+ if (false) {
+ try {
+ Instance.getTempFiles().close();
+ } catch (IOException e) {
+ Instance.getTraceHandler().error(
+ new IOException(
+ "Cannot dispose of the temporary files", e));
+ }
+ }
+
if (exitCode == 255) {
syntax(false);
}
System.out.println(story.getMeta().getLuid() + ": \""
+ story.getMeta().getTitle() + "\" imported.");
} catch (IOException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
return 1;
}
*/
public static int export(String luid, String typeString, String target,
Progress pg) {
- OutputType type = OutputType.valueOfNullOkUC(typeString);
+ OutputType type = OutputType.valueOfNullOkUC(typeString, null);
if (type == null) {
- Instance.syserr(new Exception(trans(StringId.OUTPUT_DESC,
- typeString)));
+ Instance.getTraceHandler().error(
+ new Exception(trans(StringId.OUTPUT_DESC, typeString)));
return 1;
}
try {
Instance.getLibrary().export(luid, type, target, pg);
} catch (IOException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
return 4;
}
* @return the exit return code (0 = success)
*/
private static int list(String source) {
- BasicReader.getReader().browse(source);
+ List<MetaData> 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);
+ }
return 0;
}
reader.setChapter(Integer.parseInt(chapString));
reader.read();
} catch (NumberFormatException e) {
- Instance.syserr(new IOException(
- "Chapter number cannot be parsed: " + chapString, e));
+ Instance.getTraceHandler().error(
+ new IOException("Chapter number cannot be parsed: "
+ + chapString, e));
return 2;
}
} else {
reader.read();
}
} catch (IOException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
return 1;
}
*
* @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;
sourceName = sourceName.substring("file://".length());
}
- OutputType type = OutputType.valueOfAllOkUC(typeString);
+ OutputType type = OutputType.valueOfAllOkUC(typeString, null);
if (type == null) {
- Instance.syserr(new IOException(trans(
- StringId.ERR_BAD_OUTPUT_TYPE, typeString)));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_BAD_OUTPUT_TYPE,
+ typeString)));
exitCode = 2;
} else {
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.syserr(new IOException(trans(
- StringId.ERR_SAVING, target), e));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_SAVING,
+ target), e));
exitCode = 5;
}
} else {
- Instance.syserr(new IOException(trans(
- StringId.ERR_NOT_SUPPORTED, source)));
+ Instance.getTraceHandler().error(
+ new IOException(trans(
+ StringId.ERR_NOT_SUPPORTED, source)));
exitCode = 4;
}
} catch (IOException e) {
- Instance.syserr(new IOException(trans(StringId.ERR_LOADING,
- sourceName), e));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_LOADING,
+ sourceName), e));
exitCode = 3;
}
}
} catch (MalformedURLException e) {
- Instance.syserr(new IOException(trans(StringId.ERR_BAD_URL,
- sourceName), e));
+ Instance.getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_BAD_URL,
+ sourceName), e));
exitCode = 1;
}
BasicReader.setDefaultReaderType(readerType);
return 0;
} catch (IllegalArgumentException e) {
- Instance.syserr(new IOException("Unknown reader type: "
- + readerTypeString, e));
+ Instance.getTraceHandler().error(
+ new IOException("Unknown reader type: " + readerTypeString,
+ e));
return 1;
}
}
git://git.nikiroo.be / nikiroo-utils.git / blobdiff