X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=c2edeb3ecebeba71ee7149c118b9aaaab9f60512;hb=be7416eb919eb5b2cb9f0f54f71eacc28f3992a4;hp=5bbe4cdd1f33b77bb67e609b91b7770aa886a35e;hpb=2070ced5a252b11ae7e19be1bb2430fa8e9220d9;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 5bbe4cd..c2edeb3 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,40 +1,56 @@
package be.nikiroo.fanfix.library;
import java.io.IOException;
-import java.security.InvalidParameterException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import javax.net.ssl.SSLException;
+
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.
+ * Create a new remote server that will listen for orders on the given port.
+ *
+ * The available commands are given as arrays of objects (first item is the
+ * command, the rest are the arguments).
*
- * The available commands are given as String arrays (first item is the key,
- * second is the command, the rest are the arguments):
*
- *
KEY 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
- * if not)
- *
KEY SAVE_STORY [story] [luid]: save the story 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
+ *
PING: will return PONG if the key is accepted
+ *
GET_METADATA *: will return the metadata of all the stories in the
+ * library (array)
*
+ *
GET_METADATA [luid]: will return the metadata of the story of LUID luid
+ *
GET_STORY [luid]: will return the given story if it exists (or NULL if
+ * not)
+ *
SAVE_STORY [luid]: save the story (that must be sent just after the
+ * command) with the given LUID, then return the LUID
+ *
IMPORT [url]: save the story found at the given URL, then return the LUID
+ *
+ *
DELETE_STORY [luid]: delete the story of LUID luid
+ *
GET_COVER [luid]: return the cover of the story
+ *
GET_CUSTOM_COVER ["SOURCE"|"AUTHOR"] [source]: return the cover for this
+ * source/author
+ *
SET_COVER ["SOURCE"|"AUTHOR"] [value] [luid]: set the default cover for
+ * the given source/author to the cover of the story denoted by luid
+ *
CHANGE_SOURCE [luid] [new source]: change the source of the story of LUID
+ * luid
+ *
EXIT: stop the server
*
*
* @author niki
*/
-public class RemoteLibraryServer extends Server {
- private final String key;
-
+public class RemoteLibraryServer extends ServerObject {
/**
* Create a new remote server (will not be active until
* {@link RemoteLibraryServer#start()} is called).
@@ -48,66 +64,300 @@ public class RemoteLibraryServer extends Server {
* in case of I/O error
*/
public RemoteLibraryServer(String key, int port) throws IOException {
- super(port, true);
- this.key = key;
+ super("Fanfix remote library", port, key);
+
+ setTraceHandler(Instance.getTraceHandler());
}
@Override
- protected Object onRequest(ConnectActionServer action,
+ protected Object onRequest(ConnectActionServerObject action,
Version clientVersion, Object data) throws Exception {
+ long start = new Date().getTime();
- String key = "";
String command = "";
Object[] args = new Object[0];
if (data instanceof Object[]) {
Object[] dataArray = (Object[]) data;
- if (dataArray.length >= 2) {
- args = new Object[dataArray.length - 2];
- for (int i = 2; i < dataArray.length; i++) {
- args[i] = dataArray[i];
- }
+ if (dataArray.length > 0) {
+ command = "" + dataArray[0];
- key = "" + dataArray[0];
- command = "" + dataArray[1];
+ args = new Object[dataArray.length - 1];
+ for (int i = 1; i < dataArray.length; i++) {
+ args[i - 1] = dataArray[i];
+ }
}
}
- System.out.print("[" + command + "] ");
+ String trace = "[ " + command + "] ";
for (Object arg : args) {
- System.out.print(arg + " ");
+ trace += arg + " ";
}
- System.out.println("");
+ System.out.println(trace);
- if (!key.equals(this.key)) {
- System.out.println("Key rejected.");
- throw new SecurityException("Invalid key");
- }
+ Object rep = doRequest(action, command, args);
+
+ String rec = StringUtils.formatNumber(action.getBytesReceived()) + "b";
+ String sent = StringUtils.formatNumber(action.getBytesSent()) + "b";
+ System.out.println(String.format("[>%s]: (%s sent, %s rec) in %d ms",
+ command, sent, rec, (new Date().getTime() - start)));
+
+ return rep;
+ }
- // TODO: progress (+send name + %age info back to client)
+ 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);
- if ("GET_METADATA".equals(command)) {
- if (args[0].equals("*")) {
- List metas = Instance.getLibrary().getMetas(null);
+ 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[] {});
}
- 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)) {
- return Instance.getLibrary().getStory("" + args[0], 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 ("SAVE_STORY".equals(command)) {
- Instance.getLibrary().save((Story) args[0], "" + args[1], null);
+ List