X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=b95c50f84f490134a12a8d8592b599a429b99d76;hb=3bbc86a58d68069c6eb95ec17b02daa4ca75ec7f;hp=b26899930bc35e806634536c57d4882d111e6332;hpb=2a25f7814eec9854022f1c9dee188bfbdb955591;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index b268999..b95c50f 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -2,11 +2,16 @@ 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.Progress;
+import be.nikiroo.utils.Progress.ProgressListener;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.server.ConnectActionServerObject;
import be.nikiroo.utils.serial.server.ServerObject;
@@ -20,11 +25,13 @@ import be.nikiroo.utils.serial.server.ServerObject;
* The key is always a String, the commands are also Strings; the parameters
* vary depending upon the command.
*
+ * - [key] PING: will return PONG if the key is accepted
* - [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] 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
@@ -51,8 +58,10 @@ public class RemoteLibraryServer extends ServerObject {
* in case of I/O error
*/
public RemoteLibraryServer(String key, int port) throws IOException {
- super(port, true);
+ super("Fanfix remote library", port, true);
this.key = key;
+
+ setTraceHandler(Instance.getTraceHandler());
}
@Override
@@ -74,30 +83,53 @@ public class RemoteLibraryServer extends ServerObject {
}
}
- System.out.print("[" + command + "] ");
+ String trace = "[" + command + "] ";
for (Object arg : args) {
- System.out.print(arg + " ");
+ trace += arg + " ";
}
- System.out.println("");
+ getTraceHandler().trace(trace);
if (!key.equals(this.key)) {
- System.out.println("Key rejected.");
- throw new SecurityException("Invalid key");
+ getTraceHandler().trace("Key rejected.");
+ return null;
}
- // TODO: progress (+send name + %age info back to client)
-
- if ("GET_METADATA".equals(command)) {
+ if ("PING".equals(command)) {
+ return "PONG";
+ } else if ("GET_METADATA".equals(command)) {
if (args[0].equals("*")) {
- List metas = Instance.getLibrary().getMetas(null);
+ 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)) {
- return Instance.getLibrary().getStory("" + args[0], null);
+ MetaData meta = Instance.getLibrary().getInfo("" + args[0]);
+ meta = meta.clone();
+ meta.setCover(null);
+
+ action.send(meta);
+ action.rec();
+
+ Story story = Instance.getLibrary().getStory("" + 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