X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=adef7edea06e5ca7f9d0bbc0ff1323252f8f7ff5;hb=1b9a09a2d3ddd4558c9f440392e50504421ddb2e;hp=b95c50f84f490134a12a8d8592b599a429b99d76;hpb=3bbc86a58d68069c6eb95ec17b02daa4ca75ec7f;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index b95c50f..adef7ed 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,6 +1,7 @@
package be.nikiroo.fanfix.library;
import java.io.IOException;
+import java.net.URL;
import java.security.InvalidParameterException;
import java.util.ArrayList;
import java.util.List;
@@ -12,6 +13,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,28 +24,32 @@ 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] PING: will return PONG if the key is accepted
- * - [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
- * 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] SAVE_STORY [luid]: save the story (that must be sent just after the
+ * command) with the given LUID, then return the LUID
+ * - [md5] IMPORT [url]: save the story found at the given URL, then return
+ * the LUID
+ * - [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] CHANGE_SOURCE [luid] [new source]: change the source of the story
+ * of LUID luid
+ * - [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
@@ -59,7 +65,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());
}
@@ -67,19 +73,19 @@ 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[]) {
Object[] dataArray = (Object[]) data;
if (dataArray.length >= 2) {
+ md5 = "" + dataArray[0];
+ command = "" + dataArray[1];
+
args = new Object[dataArray.length - 2];
for (int i = 2; i < dataArray.length; i++) {
args[i - 2] = dataArray[i];
}
-
- key = "" + dataArray[0];
- command = "" + dataArray[1];
}
}
@@ -89,7 +95,7 @@ public class RemoteLibraryServer extends ServerObject {
}
getTraceHandler().trace(trace);
- if (!key.equals(this.key)) {
+ if (!md5.equals(this.md5)) {
getTraceHandler().trace("Key rejected.");
return null;
}
@@ -97,7 +103,7 @@ public class RemoteLibraryServer extends ServerObject {
if ("PING".equals(command)) {
return "PONG";
} else if ("GET_METADATA".equals(command)) {
- if (args[0].equals("*")) {
+ if ("*".equals(args[0])) {
List metas = Instance.getLibrary().getMetas(
createPgForwarder(action));
return metas.toArray(new MetaData[] {});
@@ -105,14 +111,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();
@@ -129,15 +136,24 @@ public class RemoteLibraryServer extends ServerObject {
}
Story story = rebuildStory(list);
- Instance.getLibrary().save(story, "" + args[1], null);
+ Instance.getLibrary().save(story, (String) args[0], null);
+ return story.getMeta().getLuid();
+ } else if ("IMPORT".equals(command)) {
+ Story story = Instance.getLibrary().imprt(
+ new URL((String) args[0]), createPgForwarder(action));
+ return story.getMeta().getLuid();
} 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 ("CHANGE_SOURCE".equals(command)) {
+ Instance.getLibrary().changeSource((String) args[0],
+ (String) args[1], createPgForwarder(action));
} else if ("EXIT".equals(command)) {
stop(0, false);
}