X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=aa5f3056a2536981850498c17fb5a6e560bd1f4f;hb=c8d48938ca540d7b619a2c19bd76623d689b72cb;hp=c0b05064c2ec4a7915ee2b26393766ac377c0047;hpb=9f51d8ab092b891f407dc1bfe0e0fa1cef7ff944;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index c0b0506..aa5f305 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -92,7 +92,7 @@ public class RemoteLibraryServer extends ServerObject {
 			}
 		}
 
-		String trace = "[" + command + "] ";
+		String trace = "[ " + command + "] ";
 		for (Object arg : args) {
 			trace += arg + " ";
 		}
@@ -107,7 +107,7 @@ public class RemoteLibraryServer extends ServerObject {
 		Object rep = doRequest(action, command, args);
 
 		getTraceHandler().trace(
-				String.format("[/%s]: %d ms", command,
+				String.format("[>%s]: %d ms", command,
 						(new Date().getTime() - start)));
 
 		return rep;
@@ -123,6 +123,7 @@ public class RemoteLibraryServer extends ServerObject {
 				Progress pg = createPgForwarder(action);
 
 				List<MetaData> metas = new ArrayList<MetaData>();
+
 				for (MetaData meta : Instance.getLibrary().getMetas(pg)) {
 					MetaData light;
 					if (meta.getCover() == null) {
@@ -184,10 +185,10 @@ public class RemoteLibraryServer extends ServerObject {
 		} else if ("SET_SOURCE_COVER".equals(command)) {
 			Instance.getLibrary().setSourceCover((String) args[0],
 					(String) args[1]);
-		} else if ("CHANGE_SOURCE".equals(command)) {
+		} else if ("CHANGE_STA".equals(command)) {
 			Progress pg = createPgForwarder(action);
-			Instance.getLibrary().changeSource((String) args[0],
-					(String) args[1], pg);
+			Instance.getLibrary().changeSTA((String) args[0], (String) args[1],
+					(String) args[2], (String) args[3], pg);
 			forcePgDoneSent(pg);
 		} else if ("EXIT".equals(command)) {
 			stop(0, false);
@@ -330,9 +331,10 @@ public class RemoteLibraryServer extends ServerObject {
 						Instance.getTraceHandler().error(e);
 					}
 
-					isDoneForwarded[0] = pg.isDone();
 					lastTime[0] = new Date().getTime();
 				}
+
+				isDoneForwarded[0] = (pg.getProgress() >= pg.getMax());
 			}
 		});