Fix epub compatibility + cover image ext

[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 671778e60dff4aba78b66a66666be8e285a06653..354541219f0db8c433f79192b608f6373538244d 100644 (file)
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -24,7 +24,6 @@ import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
@@ -200,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);
 
@@ -311,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;
@@ -334,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);
                                }
@@ -345,22 +343,7 @@ public class Main {
                                        break;
                                }
 
-                               try {
-                                       final String fkey = key;
-                                       new ConnectActionClientObject(host, port, true) {
-                                               @Override
-                                               public void action(Version serverVersion)
-                                                               throws Exception {
-                                                       try {
-                                                               send(new Object[] { fkey, "EXIT" });
-                                                       } catch (Exception e) {
-                                                               Instance.getTraceHandler().error(e);
-                                                       }
-                                               }
-                                       }.connect();
-                               } catch (IOException e) {
-                                       Instance.getTraceHandler().error(e);
-                               }
+                               new RemoteLibrary(key, host, port).exit();
                                break;
                        case REMOTE:
                                exitCode = 255; // should not be reachable (REMOTE -> START)
@@ -558,8 +541,8 @@ public class Main {
                                                Story story = support.process(source, 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,