X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=245e6fd9b3fc7184c9178e557bb5efe4ba638b89;hb=e5609c7b3d1bfea6d499f76ab4fa871403546ab0;hp=40386ec2ce915db26a811fb18329579b88a1c714;hpb=b9ce9cad4a94e7c88770d5f7ac6cf4f200e336de;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 40386ec..245e6fd 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -12,6 +12,7 @@ import be.nikiroo.fanfix.data.Paragraph;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Progress.ProgressListener;
+import be.nikiroo.utils.StringUtils;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.server.ConnectActionServerObject;
import be.nikiroo.utils.serial.server.ServerObject;
@@ -22,27 +23,28 @@ import be.nikiroo.utils.serial.server.ServerObject;
* 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.
+ * The md5 is always a String (the MD5 hash of the access key), 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
+ *
- [md5] PING: will return PONG if the key is accepted
+ * - [md5] 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
+ *
- [md5] GET_STORY [luid]: will return the given story if it exists (or NULL
* if not)
- * - [key] SAVE_STORY [luid]: save the story (that must be sent just after the
+ *
- [md5] SAVE_STORY [luid]: save the story (that must be sent just after the
* command) 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
+ *
- [md5] DELETE_STORY [luid]: delete the story of LUID luid
+ * - [md5] GET_COVER [luid]: return the cover of the story
+ * - [md5] GET_SOURCE_COVER [source]: return the cover for this source
+ * - [md5] 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
+ * - [md5] EXIT: stop the server
*
*
* @author niki
*/
public class RemoteLibraryServer extends ServerObject {
- private final String key;
+ private final String md5;
/**
* Create a new remote server (will not be active until
@@ -58,7 +60,7 @@ public class RemoteLibraryServer extends ServerObject {
*/
public RemoteLibraryServer(String key, int port) throws IOException {
super("Fanfix remote library", port, true);
- this.key = key;
+ this.md5 = StringUtils.getMd5Hash(key);
setTraceHandler(Instance.getTraceHandler());
}
@@ -66,7 +68,7 @@ public class RemoteLibraryServer extends ServerObject {
@Override
protected Object onRequest(ConnectActionServerObject action,
Version clientVersion, Object data) throws Exception {
- String key = "";
+ String md5 = "";
String command = "";
Object[] args = new Object[0];
if (data instanceof Object[]) {
@@ -77,7 +79,7 @@ public class RemoteLibraryServer extends ServerObject {
args[i - 2] = dataArray[i];
}
- key = "" + dataArray[0];
+ md5 = "" + dataArray[0];
command = "" + dataArray[1];
}
}
@@ -88,13 +90,15 @@ public class RemoteLibraryServer extends ServerObject {
}
getTraceHandler().trace(trace);
- if (!key.equals(this.key)) {
+ if (!md5.equals(this.md5)) {
getTraceHandler().trace("Key rejected.");
return null;
}
- if ("GET_METADATA".equals(command)) {
- if (args[0].equals("*")) {
+ if ("PING".equals(command)) {
+ return "PONG";
+ } else if ("GET_METADATA".equals(command)) {
+ if ("*".equals(args[0])) {
List metas = Instance.getLibrary().getMetas(
createPgForwarder(action));
return metas.toArray(new MetaData[] {});
@@ -102,14 +106,15 @@ public class RemoteLibraryServer extends ServerObject {
throw new InvalidParameterException(
"only * is valid here, but you passed: " + args[0]);
} else if ("GET_STORY".equals(command)) {
- MetaData meta = Instance.getLibrary().getInfo("" + args[0]);
+ MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
meta = meta.clone();
meta.setCover(null);
action.send(meta);
action.rec();
- Story story = Instance.getLibrary().getStory("" + args[0], null);
+ Story story = Instance.getLibrary()
+ .getStory((String) args[0], null);
for (Object obj : breakStory(story)) {
action.send(obj);
action.rec();
@@ -126,15 +131,16 @@ public class RemoteLibraryServer extends ServerObject {
}
Story story = rebuildStory(list);
- Instance.getLibrary().save(story, "" + args[1], null);
+ Instance.getLibrary().save(story, (String) args[0], null);
} else if ("DELETE_STORY".equals(command)) {
- Instance.getLibrary().delete("" + args[0]);
+ Instance.getLibrary().delete((String) args[0]);
} else if ("GET_COVER".equals(command)) {
- return Instance.getLibrary().getCover("" + args[0]);
+ return Instance.getLibrary().getCover((String) args[0]);
} else if ("GET_SOURCE_COVER".equals(command)) {
- return Instance.getLibrary().getSourceCover("" + args[0]);
+ return Instance.getLibrary().getSourceCover((String) args[0]);
} else if ("SET_SOURCE_COVER".equals(command)) {
- Instance.getLibrary().setSourceCover("" + args[0], "" + args[1]);
+ Instance.getLibrary().setSourceCover((String) args[0],
+ (String) args[1]);
} else if ("EXIT".equals(command)) {
stop(0, false);
}