Change BasicSupport to use jsoup

[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 f18e03ca5dcefed8b616fae27e280d062da299ef..a61c5292d2e5a95076e03585856bd0254a444e13 100644 (file)
--- 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);
 
@@ -310,8 +309,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 +332,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);
                                }
@@ -539,7 +538,7 @@ 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, infoCover)