X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=63e45efc63b2977571eaacc18a133bc9cee3597d;hb=3358927d64264e9b8dafa794450057b0ea61365f;hp=8442aed1fd1663b8bb013ef8f26960e84b42e1fb;hpb=3989dfc5ced262e3c8d07fc796ec06ce5513c6b8;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index 8442aed..63e45ef 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -12,7 +12,6 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
-import be.nikiroo.utils.StringUtils;
 import be.nikiroo.utils.Version;
 import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 
@@ -26,7 +25,7 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 public class RemoteLibrary extends BasicLibrary {
 	private String host;
 	private int port;
-	private final String md5;
+	private final String key;
 
 	/**
 	 * Create a {@link RemoteLibrary} linked to the given server.
@@ -40,7 +39,7 @@ public class RemoteLibrary extends BasicLibrary {
 	 *            the port to contact it on
 	 */
 	public RemoteLibrary(String key, String host, int port) {
-		this.md5 = StringUtils.getMd5Hash(key);
+		this.key = key;
 		this.host = host;
 		this.port = port;
 	}
@@ -56,15 +55,20 @@ public class RemoteLibrary extends BasicLibrary {
 
 		result[0] = Status.INVALID;
 
-		ConnectActionClientObject action = null;
 		try {
-			action = new ConnectActionClientObject(host, port, true) {
+			Instance.getTraceHandler().trace("Getting remote lib status...");
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { md5, "PING" });
-					if ("PONG".equals(rep)) {
-						result[0] = Status.READY;
-					} else {
+					try {
+						Object rep = send(new Object[] { "PING" });
+
+						if ("PONG".equals(rep)) {
+							result[0] = Status.READY;
+						} else {
+							result[0] = Status.UNAUTORIZED;
+						}
+					} catch (IllegalArgumentException e) {
 						result[0] = Status.UNAUTORIZED;
 					}
 				}
@@ -73,8 +77,7 @@ public class RemoteLibrary extends BasicLibrary {
 				protected void onError(Exception e) {
 					result[0] = Status.UNAVAILABLE;
 				}
-			};
-
+			}.connect();
 		} catch (UnknownHostException e) {
 			result[0] = Status.INVALID;
 		} catch (IllegalArgumentException e) {
@@ -83,14 +86,7 @@ public class RemoteLibrary extends BasicLibrary {
 			result[0] = Status.UNAVAILABLE;
 		}
 
-		if (action != null) {
-			try {
-				action.connect();
-			} catch (Exception e) {
-				result[0] = Status.UNAVAILABLE;
-			}
-		}
-
+		Instance.getTraceHandler().trace("Remote lib status: " + result[0]);
 		return result[0];
 	}
 
@@ -99,10 +95,10 @@ public class RemoteLibrary extends BasicLibrary {
 		final Image[] result = new Image[1];
 
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { md5, "GET_COVER", luid });
+					Object rep = send(new Object[] { "GET_COVER", luid });
 					result[0] = (Image) rep;
 				}
 
@@ -133,11 +129,11 @@ public class RemoteLibrary extends BasicLibrary {
 		final Image[] result = new Image[1];
 
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { md5, "GET_CUSTOM_COVER",
-							type, source });
+					Object rep = send(new Object[] { "GET_CUSTOM_COVER", type,
+							source });
 					result[0] = (Image) rep;
 				}
 
@@ -159,7 +155,7 @@ public class RemoteLibrary extends BasicLibrary {
 		final Story[] result = new Story[1];
 
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
@@ -167,7 +163,7 @@ public class RemoteLibrary extends BasicLibrary {
 						pg = new Progress();
 					}
 
-					Object rep = send(new Object[] { md5, "GET_STORY", luid });
+					Object rep = send(new Object[] { "GET_STORY", luid });
 
 					MetaData meta = null;
 					if (rep instanceof MetaData) {
@@ -215,7 +211,7 @@ public class RemoteLibrary extends BasicLibrary {
 
 		final Progress pgF = pgSave;
 
-		new ConnectActionClientObject(host, port, true) {
+		new ConnectActionClientObject(host, port, key) {
 			@Override
 			public void action(Version serverVersion) throws Exception {
 				Progress pg = pgF;
@@ -223,7 +219,7 @@ public class RemoteLibrary extends BasicLibrary {
 					pg.setMinMax(0, (int) story.getMeta().getWords());
 				}
 
-				send(new Object[] { md5, "SAVE_STORY", luid });
+				send(new Object[] { "SAVE_STORY", luid });
 
 				List<Object> list = RemoteLibraryServer.breakStory(story);
 				for (Object obj : list) {
@@ -260,10 +256,10 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public synchronized void delete(final String luid) throws IOException {
-		new ConnectActionClientObject(host, port, true) {
+		new ConnectActionClientObject(host, port, key) {
 			@Override
 			public void action(Version serverVersion) throws Exception {
-				send(new Object[] { md5, "DELETE_STORY", luid });
+				send(new Object[] { "DELETE_STORY", luid });
 			}
 
 			@Override
@@ -287,10 +283,10 @@ public class RemoteLibrary extends BasicLibrary {
 	private void setCover(final String value, final String luid,
 			final String type) {
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					send(new Object[] { md5, "SET_COVER", type, value, luid });
+					send(new Object[] { "SET_COVER", type, value, luid });
 				}
 
 				@Override
@@ -327,13 +323,12 @@ public class RemoteLibrary extends BasicLibrary {
 		final String[] luid = new String[1];
 
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
 
-					Object rep = send(new Object[] { md5, "IMPORT",
-							url.toString() });
+					Object rep = send(new Object[] { "IMPORT", url.toString() });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -375,12 +370,12 @@ public class RemoteLibrary extends BasicLibrary {
 		final Progress pgF = pg == null ? new Progress() : pg;
 
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
 
-					Object rep = send(new Object[] { md5, "CHANGE_STA", luid,
+					Object rep = send(new Object[] { "CHANGE_STA", luid,
 							newSource, newTitle, newAuthor });
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -412,10 +407,10 @@ public class RemoteLibrary extends BasicLibrary {
 	 */
 	public void exit() {
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					send(new Object[] { md5, "EXIT" });
+					send(new Object[] { "EXIT" });
 				}
 
 				@Override
@@ -491,7 +486,7 @@ public class RemoteLibrary extends BasicLibrary {
 		final List<MetaData> metas = new ArrayList<MetaData>();
 
 		try {
-			new ConnectActionClientObject(host, port, true) {
+			new ConnectActionClientObject(host, port, key) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
@@ -499,7 +494,7 @@ public class RemoteLibrary extends BasicLibrary {
 						pg = new Progress();
 					}
 
-					Object rep = send(new Object[] { md5, "GET_METADATA", luid });
+					Object rep = send(new Object[] { "GET_METADATA", luid });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {