code cleanup

[nikiroo-utils.git] / src / be / nikiroo / fanfix / Main.java

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index a61c5292d2e5a95076e03585856bd0254a444e13..522aa4c4a9b95d631edcae8c922b2ca6f99f0ddb 100644 (file)
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -221,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('.');
@@ -351,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);
        }
 
        /**
@@ -445,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}
@@ -471,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: "
@@ -479,7 +488,7 @@ public class Main {
                                        return 2;
                                }
                        } else {
-                               reader.read();
+                               reader.read(true);
                        }
                } catch (IOException e) {
                        Instance.getTraceHandler().error(e);
@@ -506,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);
@@ -530,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) {