X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=adef7edea06e5ca7f9d0bbc0ff1323252f8f7ff5;hb=edf79e5e06e8dc177cc13b9bad5bf848e6f9741d;hp=221fbdfc05b21153f0c6a33ee012657f0b19cd95;hpb=e604986c4208da0091d26bc0e1c4feb4ff3c588f;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 221fbdf..adef7ed 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,76 +1,292 @@
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;
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;
/**
* Create a new remote server that will listen for order on the given port.
*
- * The available commands are:
+ * 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.
*
- *
GET_METADATA *: will get the metadata of all the stories in the library
- *
GET_STORY [luid]: will return the given story if it exists (or NULL if
- * not)
+ *
[md5] PING: will return PONG if the key is accepted
+ *
[md5] GET_METADATA *: will return the metadata of all the stories in the
+ * library
+ *
[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_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 Server {
+public class RemoteLibraryServer extends ServerObject {
+ private final String md5;
/**
* 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.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);
- // TODO: progress (+send name + %age info back to client)
+ if (!md5.equals(this.md5)) {
+ getTraceHandler().trace("Key rejected.");
+ return null;
+ }
- if ("GET_METADATA".equals(command)) {
- if (args != null && args.equals("*")) {
- List metas = Instance.getLibrary().getMetas(null);
+ 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[] {});
}
+ throw new InvalidParameterException(
+ "only * is valid here, but you passed: " + args[0]);
} else if ("GET_STORY".equals(command)) {
- if (args != null) {
- return Instance.getLibrary().getStory(args, null);
+ 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 ("GET_COVER".equals(command)) {
- if (args != null) {
- return Instance.getLibrary().getCover(args);
+ } else if ("SAVE_STORY".equals(command)) {
+ List