X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=b26899930bc35e806634536c57d4882d111e6332;hb=2a25f7814eec9854022f1c9dee188bfbdb955591;hp=5bbe4cdd1f33b77bb67e609b91b7770aa886a35e;hpb=2070ced5a252b11ae7e19be1bb2430fa8e9220d9;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 5bbe4cd..b268999 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -8,31 +8,34 @@ import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionServer;
-import be.nikiroo.utils.serial.Server;
+import be.nikiroo.utils.serial.server.ConnectActionServerObject;
+import be.nikiroo.utils.serial.server.ServerObject;
/**
* Create a new remote server that will listen for order on the given port.
*
- * The available commands are given as String arrays (first item is the key,
- * second is the command, the rest are the arguments):
+ * The available commands are given as arrays of objects (first item is the key,
+ * second is the command, the rest are the arguments).
+ *
+ * The key is always a String, the commands are also Strings; the parameters
+ * vary depending upon the command.
*
- * - KEY GET_METADATA *: will return the metadata of all the stories in the
+ *
- [key] GET_METADATA *: will return the metadata of all the stories in the
* library
- * - KEY GET_STORY [luid]: will return the given story if it exists (or NULL
+ *
- [key] GET_STORY [luid]: will return the given story if it exists (or NULL
* if not)
- * - KEY SAVE_STORY [story] [luid]: save the story with the given LUID
- * - KEY DELETE_STORY [luid]: delete the story of LUID luid
- * - KEY GET_COVER [luid]: return the cover of the story
- * - KEY GET_SOURCE_COVER [source]: return the cover for this source
- * - KEY SET_SOURCE_COVER [source], [luid]: set the default cover for the
+ *
- [key] SAVE_STORY [story] [luid]: save the story with the given LUID
+ * - [key] DELETE_STORY [luid]: delete the story of LUID luid
+ * - [key] GET_COVER [luid]: return the cover of the story
+ * - [key] GET_SOURCE_COVER [source]: return the cover for this source
+ * - [key] SET_SOURCE_COVER [source], [luid]: set the default cover for the
* given source to the cover of the story denoted by luid
- * - KEY EXIT: stop the server
+ * - [key] EXIT: stop the server
*
*
* @author niki
*/
-public class RemoteLibraryServer extends Server {
+public class RemoteLibraryServer extends ServerObject {
private final String key;
/**
@@ -53,9 +56,8 @@ public class RemoteLibraryServer extends Server {
}
@Override
- protected Object onRequest(ConnectActionServer action,
+ protected Object onRequest(ConnectActionServerObject action,
Version clientVersion, Object data) throws Exception {
-
String key = "";
String command = "";
Object[] args = new Object[0];
@@ -64,7 +66,7 @@ public class RemoteLibraryServer extends Server {
if (dataArray.length >= 2) {
args = new Object[dataArray.length - 2];
for (int i = 2; i < dataArray.length; i++) {
- args[i] = dataArray[i];
+ args[i - 2] = dataArray[i];
}
key = "" + dataArray[0];