X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=c0b05064c2ec4a7915ee2b26393766ac377c0047;hb=9f51d8ab092b891f407dc1bfe0e0fa1cef7ff944;hp=566c70fa69a572043ea6749ae5361b05b6ac4b73;hpb=e42573a004fac26378c693ce9ef0d6319713c682;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 566c70f..c0b0506 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,50 +1,354 @@
package be.nikiroo.fanfix.library;
import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Date;
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.Progress;
+import be.nikiroo.utils.Progress.ProgressListener;
+import be.nikiroo.utils.StringUtils;
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;
-public class RemoteLibraryServer extends Server {
+/**
+ * Create a new remote server that will listen for order on the given port.
+ *
+ * The available commands are given as arrays of objects (first item is the key,
+ * second is the command, the rest are the arguments).
+ *
+ * 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.
+ *
+ *
[md5] PING: will return PONG if the key is accepted
+ *
[md5] GET_METADATA *: will return the metadata of all the stories in the
+ * 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, 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_CUSTOM_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
+ *
+ *
+ * @author niki
+ */
+public class RemoteLibraryServer extends ServerObject {
+ private final String md5;
- public RemoteLibraryServer(int port) throws IOException {
- super(Version.getCurrentVersion(), port, true);
+ /**
+ * 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(String key, int port) throws IOException {
+ super("Fanfix remote library", port, true);
+ this.md5 = StringUtils.getMd5Hash(key);
+
+ setTraceHandler(Instance.getTraceHandler());
}
@Override
- protected Object onRequest(ConnectActionServer action,
+ protected Object onRequest(ConnectActionServerObject action,
Version clientVersion, Object data) throws Exception {
- String command = null;
- String args = null;
- if (data instanceof String) {
- command = (String) data;
- int pos = command.indexOf(" ");
- if (pos >= 0) {
- args = command.substring(pos + 1);
- command = command.substring(0, pos);
+ 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];
+ }
}
}
- System.out.println(String.format("COMMAND: [%s], ARGS: [%s]", command,
- args));
+ String trace = "[" + command + "] ";
+ for (Object arg : args) {
+ trace += arg + " ";
+ }
+ getTraceHandler().trace(trace);
+
+ if (!md5.equals(this.md5)) {
+ getTraceHandler().trace("Key rejected.");
+ return null;
+ }
+
+ long start = new Date().getTime();
+ Object rep = doRequest(action, command, args);
- if (command != null) {
- if (command.equals("GET_METADATA")) {
- if (args != null && args.equals("*")) {
- List metas = Instance.getLibrary().getMetas(null);
- return metas.toArray(new MetaData[] {});
- }
- } else if (command.equals("GET_STORY")) {
- if (args != null) {
- return Instance.getLibrary().getStory(args, null);
+ getTraceHandler().trace(
+ String.format("[/%s]: %d ms", command,
+ (new Date().getTime() - start)));
+
+ return rep;
+ }
+
+ private Object doRequest(ConnectActionServerObject action, String command,
+ Object[] args) throws NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException, IOException {
+ if ("PING".equals(command)) {
+ return "PONG";
+ } else if ("GET_METADATA".equals(command)) {
+ if ("*".equals(args[0])) {
+ Progress pg = createPgForwarder(action);
+
+ List metas = new ArrayList();
+ for (MetaData meta : Instance.getLibrary().getMetas(pg)) {
+ MetaData light;
+ if (meta.getCover() == null) {
+ light = meta;
+ } else {
+ light = meta.clone();
+ light.setCover(null);
+ }
+
+ metas.add(light);
}
+
+ forcePgDoneSent(pg);
+ return metas.toArray(new MetaData[] {});
+ }
+
+ return new MetaData[] { Instance.getLibrary().getInfo(
+ (String) args[0]) };
+ } else if ("GET_STORY".equals(command)) {
+ MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
+ meta = meta.clone();
+ meta.setCover(null);
+
+ action.send(meta);
+ action.rec();
+
+ Story story = Instance.getLibrary()
+ .getStory((String) args[0], null);
+ for (Object obj : breakStory(story)) {
+ action.send(obj);
+ action.rec();
+ }
+ } else if ("SAVE_STORY".equals(command)) {
+ List