X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=4ee3f74d221c3497978cc57d70fc935fd466579f;hp=4f89a1fa19263c9d4bedf513274442660d3a023f;hb=97654d115d9f0286f9eea9fe50216cb3737e9ed6;hpb=d9691f01bac1ea36d234f240534ae8bb94ab522a

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 4f89a1f..4ee3f74 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -202,15 +202,7 @@ public class RemoteLibraryServer extends ServerObject {
 				Progress pg = createPgForwarder(action);
 
 				for (MetaData meta : Instance.getInstance().getLibrary().getMetas(pg)) {
-					MetaData light;
-					if (meta.getCover() == null) {
-						light = meta;
-					} else {
-						light = meta.clone();
-						light.setCover(null);
-					}
-
-					metas.add(light);
+					metas.add(removeCover(meta));
 				}
 
 				forcePgDoneSent(pg);
@@ -413,16 +405,19 @@ public class RemoteLibraryServer extends ServerObject {
 	 * @return TRUE if it was a progress event, FALSE if not
 	 */
 	static boolean updateProgress(Progress pg, Object rep) {
-		if (rep instanceof Integer[]) {
-			Integer[] a = (Integer[]) rep;
-			if (a.length == 3) {
-				int min = a[0];
-				int max = a[1];
-				int progress = a[2];
+		if (rep instanceof Object[]) {
+			Object[] a = (Object[]) rep;
+			if (a.length >= 3) {
+				int min = (Integer)a[0];
+				int max = (Integer)a[1];
+				int progress = (Integer)a[2];
 
 				if (min >= 0 && min <= max) {
 					pg.setMinMax(min, max);
 					pg.setProgress(progress);
+					if (a.length >= 4) {
+						pg.put("meta", a[3]);
+					}
 
 					return true;
 				}
@@ -451,27 +446,36 @@ public class RemoteLibraryServer extends ServerObject {
 		};
 
 		final Integer[] p = new Integer[] { -1, -1, -1 };
+		final Object[] pMeta = new MetaData[1];
 		final Long[] lastTime = new Long[] { new Date().getTime() };
 		pg.addProgressListener(new ProgressListener() {
 			@Override
 			public void progress(Progress progress, String name) {
+				Object meta = pg.get("meta");
+				if (meta instanceof MetaData) {
+					meta = removeCover((MetaData)meta);
+				}
+				
 				int min = pg.getMin();
 				int max = pg.getMax();
-				int relativeProgress = min
+				int rel = min
 						+ (int) Math.round(pg.getRelativeProgress()
 								* (max - min));
-
+				
+				boolean samePg = p[0] == min && p[1] == max && p[2] == rel;
+				
 				// 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)
+				if (!samePg || !same(pMeta[0], meta) //
 						|| (new Date().getTime() - lastTime[0] > 2000)) {
 					p[0] = min;
 					p[1] = max;
-					p[2] = relativeProgress;
+					p[2] = rel;
+					pMeta[0] = meta;
 
 					try {
-						action.send(new Integer[] { min, max, relativeProgress });
+						action.send(new Object[] { min, max, rel, meta });
 						action.rec();
 					} catch (Exception e) {
 						getTraceHandler().error(e);
@@ -486,6 +490,13 @@ public class RemoteLibraryServer extends ServerObject {
 
 		return pg;
 	}
+	
+	private boolean same(Object obj1, Object obj2) {
+		if (obj1 == null || obj2 == null)
+			return obj1 == null && obj2 == null;
+
+		return obj1.equals(obj2);
+	}
 
 	// with 30 seconds timeout
 	private void forcePgDoneSent(Progress pg) {
@@ -499,4 +510,16 @@ public class RemoteLibraryServer extends ServerObject {
 			}
 		}
 	}
+	
+	private MetaData removeCover(MetaData meta) {
+		MetaData light;
+		if (meta.getCover() == null) {
+			light = meta;
+		} else {
+			light = meta.clone();
+			light.setCover(null);
+		}
+		
+		return light;
+	}
 }