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.ServerObject;
} 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('.');
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 {
+ Instance.getTempFiles().close();
+ } catch (IOException e) {
+ Instance.getTraceHandler()
+ .error(new IOException(
+ "Cannot dispose of the temporary files", e));
+ }
+
if (exitCode == 255) {
syntax(false);
}
}
/**
- * 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, infoCover)