X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=d6bdd1568546d625477f5a0c4baaae1f5bc3708f;hb=a0565636356ec3cd0154397215eb38ea4400df0a;hp=d3263e218312e07d9b366ff5eb2da2cd8bf3dcdb;hpb=3040c4f03ba0c34694fca6b8e9413746bef65a37;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index d3263e2..d6bdd15 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -7,13 +7,13 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.net.ssl.SSLException;
+
 import be.nikiroo.fanfix.Instance;
 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;
 
 /**
@@ -60,23 +60,23 @@ public class RemoteLibrary extends BasicLibrary {
 			Instance.getTraceHandler().trace("Getting remote lib status...");
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
-					try {
-						Object rep = sendCmd(this, new Object[] { "PING" });
-
-						if ("PONG".equals(rep)) {
-							result[0] = Status.READY;
-						} else {
-							result[0] = Status.UNAUTORIZED;
-						}
-					} catch (IllegalArgumentException e) {
+				public void action() throws Exception {
+					Object rep = send(new Object[] { "PING" });
+
+					if ("PONG".equals(rep)) {
+						result[0] = Status.READY;
+					} else {
 						result[0] = Status.UNAUTORIZED;
 					}
 				}
 
 				@Override
 				protected void onError(Exception e) {
-					result[0] = Status.UNAVAILABLE;
+					if (e instanceof SSLException) {
+						result[0] = Status.UNAUTORIZED;
+					} else {
+						result[0] = Status.UNAVAILABLE;
+					}
 				}
 			}.connect();
 		} catch (UnknownHostException e) {
@@ -98,15 +98,19 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
-					Object rep = sendCmd(this,
-							new Object[] { "GET_COVER", luid });
+				public void action() throws Exception {
+					Object rep = send(new Object[] { "GET_COVER", luid });
 					result[0] = (Image) rep;
 				}
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (Exception e) {
@@ -133,15 +137,20 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
-					Object rep = sendCmd(this, new Object[] {
-							"GET_CUSTOM_COVER", type, source });
+				public void action() throws Exception {
+					Object rep = send(new Object[] { "GET_CUSTOM_COVER", type,
+							source });
 					result[0] = (Image) rep;
 				}
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (Exception e) {
@@ -159,14 +168,13 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
+				public void action() throws Exception {
 					Progress pg = pgF;
 					if (pg == null) {
 						pg = new Progress();
 					}
 
-					Object rep = sendCmd(this,
-							new Object[] { "GET_STORY", luid });
+					Object rep = send(new Object[] { "GET_STORY", luid });
 
 					MetaData meta = null;
 					if (rep instanceof MetaData) {
@@ -188,7 +196,12 @@ public class RemoteLibrary extends BasicLibrary {
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (Exception e) {
@@ -216,13 +229,13 @@ public class RemoteLibrary extends BasicLibrary {
 
 		new ConnectActionClientObject(host, port, key) {
 			@Override
-			public void action(Version serverVersion) throws Exception {
+			public void action() throws Exception {
 				Progress pg = pgF;
 				if (story.getMeta().getWords() <= Integer.MAX_VALUE) {
 					pg.setMinMax(0, (int) story.getMeta().getWords());
 				}
 
-				sendCmd(this, new Object[] { "SAVE_STORY", luid });
+				send(new Object[] { "SAVE_STORY", luid });
 
 				List<Object> list = RemoteLibraryServer.breakStory(story);
 				for (Object obj : list) {
@@ -237,7 +250,12 @@ public class RemoteLibrary extends BasicLibrary {
 
 			@Override
 			protected void onError(Exception e) {
-				Instance.getTraceHandler().error(e);
+				if (e instanceof SSLException) {
+					Instance.getTraceHandler().error(
+							"Connection refused (bad key)");
+				} else {
+					Instance.getTraceHandler().error(e);
+				}
 			}
 		}.connect();
 
@@ -261,13 +279,18 @@ public class RemoteLibrary extends BasicLibrary {
 	public synchronized void delete(final String luid) throws IOException {
 		new ConnectActionClientObject(host, port, key) {
 			@Override
-			public void action(Version serverVersion) throws Exception {
-				sendCmd(this, new Object[] { "DELETE_STORY", luid });
+			public void action() throws Exception {
+				send(new Object[] { "DELETE_STORY", luid });
 			}
 
 			@Override
 			protected void onError(Exception e) {
-				Instance.getTraceHandler().error(e);
+				if (e instanceof SSLException) {
+					Instance.getTraceHandler().error(
+							"Connection refused (bad key)");
+				} else {
+					Instance.getTraceHandler().error(e);
+				}
 			}
 		}.connect();
 	}
@@ -288,14 +311,18 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
-					sendCmd(this,
-							new Object[] { "SET_COVER", type, value, luid });
+				public void action() throws Exception {
+					send(new Object[] { "SET_COVER", type, value, luid });
 				}
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (IOException e) {
@@ -329,11 +356,10 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
+				public void action() throws Exception {
 					Progress pg = pgF;
 
-					Object rep = sendCmd(this,
-							new Object[] { "IMPORT", url.toString() });
+					Object rep = send(new Object[] { "IMPORT", url.toString() });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -349,7 +375,12 @@ public class RemoteLibrary extends BasicLibrary {
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (IOException e) {
@@ -377,11 +408,11 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
+				public void action() throws Exception {
 					Progress pg = pgF;
 
-					Object rep = sendCmd(this, new Object[] { "CHANGE_STA",
-							luid, newSource, newTitle, newAuthor });
+					Object rep = send(new Object[] { "CHANGE_STA", luid,
+							newSource, newTitle, newAuthor });
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
 							break;
@@ -393,7 +424,12 @@ public class RemoteLibrary extends BasicLibrary {
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (IOException e) {
@@ -414,13 +450,18 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
-					sendCmd(this, new Object[] { "EXIT" });
+				public void action() throws Exception {
+					send(new Object[] { "EXIT" });
 				}
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (IOException e) {
@@ -493,14 +534,13 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action(Version serverVersion) throws Exception {
+				public void action() throws Exception {
 					Progress pg = pgF;
 					if (pg == null) {
 						pg = new Progress();
 					}
 
-					Object rep = sendCmd(this, new Object[] { "GET_METADATA",
-							luid });
+					Object rep = send(new Object[] { "GET_METADATA", luid });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -521,7 +561,12 @@ public class RemoteLibrary extends BasicLibrary {
 
 				@Override
 				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					if (e instanceof SSLException) {
+						Instance.getTraceHandler().error(
+								"Connection refused (bad key)");
+					} else {
+						Instance.getTraceHandler().error(e);
+					}
 				}
 			}.connect();
 		} catch (Exception e) {
@@ -530,30 +575,4 @@ public class RemoteLibrary extends BasicLibrary {
 
 		return metas;
 	}
-
-	// IllegalArgumentException if key is bad
-	private Object sendCmd(ConnectActionClientObject action, Object[] params)
-			throws IOException, NoSuchFieldException, NoSuchMethodException,
-			ClassNotFoundException {
-		Object rep = action.send(params);
-
-		String hash = hashKey(key, "" + rep);
-		return action.send(hash);
-	}
-
-	/**
-	 * Return a hash that corresponds to the given key and the given random
-	 * value.
-	 * 
-	 * @param key
-	 *            the key (the secret)
-	 * 
-	 * @param random
-	 *            the random value
-	 * 
-	 * @return a hash that was computed using both
-	 */
-	static String hashKey(String key, String random) {
-		return StringUtils.getMd5Hash(key + " <==> " + random);
-	}
 }