X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=f413a2d66e95ce296d8d7d1388103b98c41e7722;hb=5895a95876fe63e76e726ef7fc4c97efe2ebd5b1;hp=70f71ed58a17be21ba36cb5505adcc52056e8596;hpb=62c63b0724f4bc45999cb2e7186b4b3ada479a0a;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 70f71ed..f413a2d 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -23,9 +23,7 @@ import be.nikiroo.fanfix.reader.Reader.ReaderType;
 import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 import be.nikiroo.utils.Progress;
-import be.nikiroo.utils.TraceHandler;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
@@ -201,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);
 
@@ -334,8 +331,8 @@ public class Main {
 				}
 				try {
 					ServerObject server = new RemoteLibraryServer(key, port);
-					server.setTraceHandler(new TraceHandler(true, true, true));
-					server.start();
+					server.setTraceHandler(Instance.getTraceHandler());
+					server.run();
 				} catch (IOException e) {
 					Instance.getTraceHandler().error(e);
 				}
@@ -346,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)
@@ -559,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,