X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=dae73e4b4c4e0c4c787b8c05ecb19ab34f362ceb;hb=efa3c511f39ab1432675e3b75b9b7b32d579f1c3;hp=84d763fce51f5c4ad97cfd1fda07d41dee71845c;hpb=416c54f8bf5f60e2f8d7981e24fdd613fb9246f1;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 84d763f..dae73e4 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,7 +1,7 @@
package be.nikiroo.fanfix.library;
import java.io.IOException;
-import java.security.InvalidParameterException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -28,16 +28,23 @@ import be.nikiroo.utils.serial.server.ServerObject;
*
* - [md5] PING: will return PONG if the key is accepted
* - [md5] GET_METADATA *: will return the metadata of all the stories in the
- * library
+ * library (array)
+ * *
+ * - [md5] GET_METADATA [luid]: will return the metadata of the story of LUID
+ * luid
* - [md5] GET_STORY [luid]: will return the given story if it exists (or NULL
* if not)
* - [md5] SAVE_STORY [luid]: save the story (that must be sent just after the
- * command) with the given LUID
+ * 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
+ * - [md5] CHANGE_SOURCE [luid] [new source]: change the source of the story
+ * of LUID luid
* - [md5] EXIT: stop the server
*
*
@@ -74,13 +81,13 @@ public class RemoteLibraryServer extends ServerObject {
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];
}
-
- md5 = "" + dataArray[0];
- command = "" + dataArray[1];
}
}
@@ -98,22 +105,24 @@ 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[] {});
}
- throw new InvalidParameterException(
- "only * is valid here, but you passed: " + args[0]);
+
+ return new MetaData[] { Instance.getLibrary().getInfo(
+ (String) 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();
@@ -130,15 +139,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);
}