X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=c0b05064c2ec4a7915ee2b26393766ac377c0047;hb=9f51d8ab092b891f407dc1bfe0e0fa1cef7ff944;hp=138246ae47044a33399b132ac6c619ca320083df;hpb=aac7079dc723e0c03a6c6f58a81d4ef756811fa2;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 138246a..c0b0506 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -3,6 +3,7 @@ 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;
@@ -40,7 +41,7 @@ import be.nikiroo.utils.serial.server.ServerObject;
* 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] 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
@@ -102,12 +103,39 @@ public class RemoteLibraryServer extends ServerObject {
return null;
}
+ long start = new Date().getTime();
+ Object rep = doRequest(action, command, args);
+
+ 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])) {
- List metas = Instance.getLibrary().getMetas(
- createPgForwarder(action));
+ 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[] {});
}
@@ -142,21 +170,25 @@ public class RemoteLibraryServer extends ServerObject {
Instance.getLibrary().save(story, (String) args[0], null);
return story.getMeta().getLuid();
} else if ("IMPORT".equals(command)) {
+ Progress pg = createPgForwarder(action);
Story story = Instance.getLibrary().imprt(
- new URL((String) args[0]), createPgForwarder(action));
+ new URL((String) args[0]), pg);
+ forcePgDoneSent(pg);
return story.getMeta().getLuid();
} else if ("DELETE_STORY".equals(command)) {
Instance.getLibrary().delete((String) args[0]);
} else if ("GET_COVER".equals(command)) {
return Instance.getLibrary().getCover((String) args[0]);
- } else if ("GET_SOURCE_COVER".equals(command)) {
- return Instance.getLibrary().getSourceCover((String) args[0]);
+ } else if ("GET_CUSTOM_SOURCE_COVER".equals(command)) {
+ return Instance.getLibrary().getCustomSourceCover((String) args[0]);
} else if ("SET_SOURCE_COVER".equals(command)) {
Instance.getLibrary().setSourceCover((String) args[0],
(String) args[1]);
} else if ("CHANGE_SOURCE".equals(command)) {
+ Progress pg = createPgForwarder(action);
Instance.getLibrary().changeSource((String) args[0],
- (String) args[1], createPgForwarder(action));
+ (String) args[1], pg);
+ forcePgDoneSent(pg);
} else if ("EXIT".equals(command)) {
stop(0, false);
}
@@ -178,8 +210,6 @@ public class RemoteLibraryServer extends ServerObject {
* @return the list of {@link Object}s
*/
static List