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;
/**
} 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);
}
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);
}
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)
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,