X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=7d5a0ae10d988f1a79f52f7732dfb0411e5f057e;hb=e1de8087ab1623f7624018af905ea3bb0ef45802;hp=adef7edea06e5ca7f9d0bbc0ff1323252f8f7ff5;hpb=edf79e5e06e8dc177cc13b9bad5bf848e6f9741d;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index adef7ed..7d5a0ae 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -2,8 +2,8 @@ package be.nikiroo.fanfix.library;
 
 import java.io.IOException;
 import java.net.URL;
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import be.nikiroo.fanfix.Instance;
@@ -29,7 +29,10 @@ import be.nikiroo.utils.serial.server.ServerObject;
  * <ul>
  * <li>[md5] PING: will return PONG if the key is accepted</li>
  * <li>[md5] GET_METADATA *: will return the metadata of all the stories in the
- * library</li>
+ * library (array)</li>
+ * *
+ * <li>[md5] GET_METADATA [luid]: will return the metadata of the story of LUID
+ * luid</li>
  * <li>[md5] GET_STORY [luid]: will return the given story if it exists (or NULL
  * if not)</li>
  * <li>[md5] SAVE_STORY [luid]: save the story (that must be sent just after the
@@ -38,7 +41,7 @@ import be.nikiroo.utils.serial.server.ServerObject;
  * the LUID</li>
  * <li>[md5] DELETE_STORY [luid]: delete the story of LUID luid</li>
  * <li>[md5] GET_COVER [luid]: return the cover of the story</li>
- * <li>[md5] GET_SOURCE_COVER [source]: return the cover for this source</li>
+ * <li>[md5] GET_CUSTOM_SOURCE_COVER [source]: return the cover for this source</li>
  * <li>[md5] SET_SOURCE_COVER [source], [luid]: set the default cover for the
  * given source to the cover of the story denoted by luid</li>
  * <li>[md5] CHANGE_SOURCE [luid] [new source]: change the source of the story
@@ -104,12 +107,14 @@ public class RemoteLibraryServer extends ServerObject {
 			return "PONG";
 		} else if ("GET_METADATA".equals(command)) {
 			if ("*".equals(args[0])) {
-				List<MetaData> metas = Instance.getLibrary().getMetas(
-						createPgForwarder(action));
+				Progress pg = createPgForwarder(action);
+				List<MetaData> metas = Instance.getLibrary().getMetas(pg);
+				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)) {
 			MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
 			meta = meta.clone();
@@ -139,21 +144,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);
 		}
@@ -260,8 +269,16 @@ public class RemoteLibraryServer extends ServerObject {
 	 */
 	private static Progress createPgForwarder(
 			final ConnectActionServerObject action) {
-		final Progress pg = new Progress();
+		final Boolean[] isDoneForwarded = new Boolean[] { false };
+		final Progress pg = new Progress() {
+			@Override
+			public boolean isDone() {
+				return isDoneForwarded[0];
+			}
+		};
+
 		final Integer[] p = new Integer[] { -1, -1, -1 };
+		final Long[] lastTime = new Long[] { new Date().getTime() };
 		pg.addProgressListener(new ProgressListener() {
 			@Override
 			public void progress(Progress progress, String name) {
@@ -271,8 +288,11 @@ public class RemoteLibraryServer extends ServerObject {
 						+ (int) Math.round(pg.getRelativeProgress()
 								* (max - min));
 
-				// Do not re-send the same value twice over the wire
-				if (p[0] != min || p[1] != max || p[2] != relativeProgress) {
+				// Do not re-send the same value twice over the wire,
+				// unless more than 2 seconds have elapsed (to maintain the
+				// connection)
+				if ((p[0] != min || p[1] != max || p[2] != relativeProgress)
+						|| (new Date().getTime() - lastTime[0] > 2000)) {
 					p[0] = min;
 					p[1] = max;
 					p[2] = relativeProgress;
@@ -283,10 +303,26 @@ public class RemoteLibraryServer extends ServerObject {
 					} catch (Exception e) {
 						Instance.getTraceHandler().error(e);
 					}
+
+					isDoneForwarded[0] = pg.isDone();
+					lastTime[0] = new Date().getTime();
 				}
 			}
 		});
 
 		return pg;
 	}
+
+	// with 30 seconds timeout
+	private static void forcePgDoneSent(Progress pg) {
+		long start = new Date().getTime();
+		pg.done();
+		while (!pg.isDone() && new Date().getTime() - start < 30000) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				Instance.getTraceHandler().error(e);
+			}
+		}
+	}
 }