X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=522aa4c4a9b95d631edcae8c922b2ca6f99f0ddb;hb=31e28683c108bb5903864c58b0cc06bfa258fbfc;hp=9d462c402f619246a8ae4854ed1ffe8c185e6250;hpb=468b960ba378ae71230f475d3e97521e133ec019;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 9d462c4..522aa4c 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -21,7 +21,7 @@ import be.nikiroo.fanfix.reader.BasicReader;
 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;
@@ -199,9 +199,8 @@ public class Main {
 				} 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);
 
@@ -222,6 +221,9 @@ public class Main {
 				int diff = progress.getProgress() - current;
 				current += diff;
 
+				if (diff <= 0)
+					return;
+
 				StringBuilder builder = new StringBuilder();
 				for (int i = 0; i < diff; i++) {
 					builder.append('.');
@@ -310,8 +312,8 @@ public class Main {
 			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;
@@ -333,7 +335,7 @@ public class Main {
 				try {
 					ServerObject server = new RemoteLibraryServer(key, port);
 					server.setTraceHandler(Instance.getTraceHandler());
-					server.start();
+					server.run();
 				} catch (IOException e) {
 					Instance.getTraceHandler().error(e);
 				}
@@ -352,13 +354,19 @@ public class Main {
 			}
 		}
 
+		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);
 	}
 
 	/**
@@ -446,7 +454,7 @@ public class Main {
 	}
 
 	/**
-	 * 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}
@@ -472,7 +480,7 @@ public class Main {
 			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: "
@@ -480,7 +488,7 @@ public class Main {
 					return 2;
 				}
 			} else {
-				reader.read();
+				reader.read(true);
 			}
 		} catch (IOException e) {
 			Instance.getTraceHandler().error(e);
@@ -507,10 +515,11 @@ public class Main {
 	 * 
 	 * @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);
@@ -531,6 +540,8 @@ public class Main {
 					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) {
@@ -539,11 +550,11 @@ public class Main {
 							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,