X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=2799a65a1923975f4695dd8d13bb1c33c0a91f1d;hb=851dd5388802907146e88c3f6b9e68094e73693e;hp=1fe182b87980c01e44844b34a1916d40bda6a97e;hpb=5e848e6a19a87f4e14b13147f628667376503d74;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 1fe182b..2799a65 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -2,96 +2,201 @@ package be.nikiroo.fanfix.library;
import java.io.IOException;
import java.security.InvalidParameterException;
+import java.util.ArrayList;
import java.util.List;
import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.fanfix.data.Paragraph;
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.ConnectActionClientObject;
+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 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.
*
- * - 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
- * - GET_STORY [luid]: will return the given story if it exists (or NULL if
- * not)
- * - SAVE_STORY [story] [luid]: save the story with the given LUID
- * - DELETE_STORY [luid]: delete the story of LUID luid
- * - GET_COVER [luid]: return the cover of the story
- * - GET_SOURCE_COVER [source]: return the cover for this source
- * - SET_SOURCE_COVER [source], [luid]: set the default cover for the given
- * source to the cover of the story denoted by luid
- * - EXIT: stop the server
+ * - [key] 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
+ * given source to the cover of the story denoted by luid
+ * - [key] EXIT: stop the server
*
*
* @author niki
*/
-public class RemoteLibraryServer extends Server {
+public class RemoteLibraryServer extends ServerObject {
+ private final String key;
/**
* Create a new remote server (will not be active until
* {@link RemoteLibraryServer#start()} is called).
*
+ * @param key
+ * the key that will restrict access to this server
* @param port
* the port to listen on
*
* @throws IOException
* in case of I/O error
*/
- public RemoteLibraryServer(int port) throws IOException {
- super(port, true);
+ public RemoteLibraryServer(String key, int port) throws IOException {
+ super("Fanfix remote library", port, true);
+ this.key = key;
}
@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];
if (data instanceof Object[]) {
- args = (Object[]) data;
- if (args.length > 0) {
- command = "" + args[0];
+ Object[] dataArray = (Object[]) data;
+ if (dataArray.length >= 2) {
+ 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];
}
}
- System.out.print("COMMAND: ");
+ System.out.print("[" + command + "] ");
for (Object arg : args) {
System.out.print(arg + " ");
}
System.out.println("");
+ if (!key.equals(this.key)) {
+ System.out.println("Key rejected.");
+ throw new SecurityException("Invalid key");
+ }
+
// TODO: progress (+send name + %age info back to client)
if ("GET_METADATA".equals(command)) {
- if (args[1].equals("*")) {
+ if (args[0].equals("*")) {
List metas = Instance.getLibrary().getMetas(null);
return metas.toArray(new MetaData[] {});
}
throw new InvalidParameterException(
- "only * is valid here, but you passed: " + args[1]);
+ "only * is valid here, but you passed: " + args[0]);
} else if ("GET_STORY".equals(command)) {
- return Instance.getLibrary().getStory("" + args[1], null);
+ Story story = Instance.getLibrary().getStory("" + args[0], null);
+ sendStory(story, action);
} else if ("SAVE_STORY".equals(command)) {
- Instance.getLibrary().save((Story) args[1], "" + args[2], null);
+ Story story = recStory(action);
+ Instance.getLibrary().save(story, "" + args[1], null);
} else if ("DELETE_STORY".equals(command)) {
- Instance.getLibrary().delete("" + args[1]);
+ Instance.getLibrary().delete("" + args[0]);
} else if ("GET_COVER".equals(command)) {
- return Instance.getLibrary().getCover("" + args[1]);
+ return Instance.getLibrary().getCover("" + args[0]);
} else if ("GET_SOURCE_COVER".equals(command)) {
- return Instance.getLibrary().getSourceCover("" + args[1]);
+ return Instance.getLibrary().getSourceCover("" + args[0]);
} else if ("SET_SOURCE_COVER".equals(command)) {
- Instance.getLibrary().setSourceCover("" + args[1], "" + args[2]);
+ Instance.getLibrary().setSourceCover("" + args[0], "" + args[1]);
} else if ("EXIT".equals(command)) {
stop(0, false);
}
return null;
}
+
+ public static void sendStory(Story story, Object sender)
+ throws NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException, IOException {
+
+ if (!story.getMeta().isImageDocument()) {
+ sendNextObject(sender, story);
+ return;
+ }
+
+ story = story.clone();
+
+ List chaps = story.getChapters();
+ story.setChapters(new ArrayList());
+ sendNextObject(sender, story);
+
+ for (Chapter chap : chaps) {
+ List paras = chap.getParagraphs();
+ chap.setParagraphs(new ArrayList());
+ sendNextObject(sender, chap);
+
+ for (Paragraph para : paras) {
+ sendNextObject(sender, para);
+ }
+ }
+ }
+
+ public static Story recStory(Object source) throws NoSuchFieldException,
+ NoSuchMethodException, ClassNotFoundException, IOException {
+
+ Story story = null;
+
+ Object obj = getNextObject(source);
+ if (obj instanceof Story) {
+ story = (Story) obj;
+
+ Chapter current = null;
+ for (obj = getNextObject(source); obj != null; obj = getNextObject(source)) {
+ if (obj instanceof Chapter) {
+ current = (Chapter) obj;
+ story.getChapters().add(current);
+ } else if (obj instanceof Paragraph) {
+ current.getParagraphs().add((Paragraph) obj);
+ }
+ }
+ }
+
+ return story;
+ }
+
+ private static Object getNextObject(Object clientOrServer)
+ throws NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException, IOException {
+ if (clientOrServer instanceof ConnectActionClientObject) {
+ ConnectActionClientObject client = (ConnectActionClientObject) clientOrServer;
+ return client.send(null);
+ } else if (clientOrServer instanceof ConnectActionServerObject) {
+ ConnectActionServerObject server = (ConnectActionServerObject) clientOrServer;
+ Object obj = server.rec();
+ server.send(null);
+ return obj;
+ } else {
+ throw new ClassNotFoundException();
+ }
+ }
+
+ private static void sendNextObject(Object clientOrServer, Object obj)
+ throws NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException, IOException {
+ if (clientOrServer instanceof ConnectActionClientObject) {
+ ConnectActionClientObject client = (ConnectActionClientObject) clientOrServer;
+ client.send(obj);
+ } else if (clientOrServer instanceof ConnectActionServerObject) {
+ ConnectActionServerObject server = (ConnectActionServerObject) clientOrServer;
+ server.send(obj);
+ server.rec();
+ } else {
+ throw new ClassNotFoundException();
+ }
+ }
}