git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remote: new command "EXIT"
[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 c17a1d8b988f0a52c7c763efd9bad67f48bebd92..6a8a4a5af7542dccb07e8ffd5ba97dccd1abb05a 100644
(file)
--- a/
src/be/nikiroo/fanfix/Main.java
+++ b/
src/be/nikiroo/fanfix/Main.java
@@
-8,6
+8,8
@@
import java.net.URL;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.library.BasicLibrary;
+import be.nikiroo.fanfix.library.CacheLibrary;
import be.nikiroo.fanfix.library.LocalLibrary;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.fanfix.library.RemoteLibraryServer;
import be.nikiroo.fanfix.library.LocalLibrary;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.fanfix.library.RemoteLibraryServer;
@@
-20,6
+22,7
@@
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.fanfix.supported.BasicSupport.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
+import be.nikiroo.utils.serial.ConnectActionClient;
import be.nikiroo.utils.serial.Server;
/**
import be.nikiroo.utils.serial.Server;
/**
@@
-29,7
+32,7
@@
import be.nikiroo.utils.serial.Server;
*/
public class Main {
private enum MainAction {
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, REMOTE,
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER,
STOP_SERVER,
REMOTE,
}
/**
}
/**
@@
-60,6
+63,7
@@
public class Main {
* for this command</li>
* <li>--version: get the version of the program</li>
* <li>--server [port]: start a server on this port</li>
* for this command</li>
* <li>--version: get the version of the program</li>
* <li>--server [port]: start a server on this port</li>
+ * <li>--stop-server [port]: stop the running server on this port if any</li>
* <li>--remote [host] [port]: use a the given remote library</li>
* </ul>
*
* <li>--remote [host] [port]: use a the given remote library</li>
* </ul>
*
@@
-174,6
+178,7
@@
public class Main {
exitCode = 255; // no arguments for this option
break;
case SERVER:
exitCode = 255; // no arguments for this option
break;
case SERVER:
+ case STOP_SERVER:
if (port == null) {
port = Integer.parseInt(args[i]);
} else {
if (port == null) {
port = Integer.parseInt(args[i]);
} else {
@@
-185,8
+190,13
@@
public class Main {
host = args[i];
} else if (port == null) {
port = Integer.parseInt(args[i]);
host = args[i];
} else if (port == null) {
port = Integer.parseInt(args[i]);
- BasicReader
- .setDefaultLibrary(new RemoteLibrary(host, port));
+
+ File remoteCacheDir = Instance.getRemoteDir(host);
+ BasicLibrary lib = new RemoteLibrary(host, port);
+ lib = new CacheLibrary(remoteCacheDir, lib);
+
+ BasicReader.setDefaultLibrary(lib);
+
action = MainAction.START;
} else {
exitCode = 255;
action = MainAction.START;
} else {
exitCode = 255;
@@
-316,6
+326,28
@@
public class Main {
Instance.syserr(e);
}
return;
Instance.syserr(e);
}
return;
+ case STOP_SERVER:
+ if (port == null) {
+ exitCode = 255;
+ break;
+ }
+
+ try {
+ new ConnectActionClient(host, port, true) {
+ @Override
+ public void action(Version serverVersion)
+ throws Exception {
+ try {
+ send(new Object[] { "EXIT" });
+ } catch (Exception e) {
+ Instance.syserr(e);
+ }
+ }
+ }.connect();
+ } catch (IOException e) {
+ Instance.syserr(e);
+ }
+ break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
break;