X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=library%2FRemoteLibrary.java;h=3e0e192d1806abb2e7d4bd270f0e808821c20991;hp=ce4305aadad96bfe9446817d467234545ccfce7a;hb=258e065f81071a861711ef935dca3ec5563f4360;hpb=669a62833b4458bad0772debdd06921080500221

diff --git a/library/RemoteLibrary.java b/library/RemoteLibrary.java
index ce4305a..3e0e192 100644
--- a/library/RemoteLibrary.java
+++ b/library/RemoteLibrary.java
@@ -21,6 +21,8 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject;
  * This {@link BasicLibrary} will access a remote server to list the available
  * stories, and download the ones you try to load to the local directory
  * specified in the configuration.
+ * <p>
+ * This remote library uses a custom fanfix:// protocol.
  * 
  * @author niki
  */
@@ -35,8 +37,8 @@ public class RemoteLibrary extends BasicLibrary {
 		}
 
 		@Override
-		public Object send(Object data) throws IOException,
-				NoSuchFieldException, NoSuchMethodException,
+		public Object send(Object data)
+				throws IOException, NoSuchFieldException, NoSuchMethodException,
 				ClassNotFoundException {
 			Object rep = super.send(data);
 			if (rep instanceof RemoteLibraryException) {
@@ -60,7 +62,7 @@ public class RemoteLibrary extends BasicLibrary {
 	 * Create a {@link RemoteLibrary} linked to the given server.
 	 * <p>
 	 * Note that the key is structured:
-	 * <tt><b><i>xxx</i></b>(|<b><i>yyy</i></b>|<b>wl</b>)(|<b>rw</b>)</tt>
+	 * <tt><b><i>xxx</i></b>(|<b><i>yyy</i></b>(|<b>wl</b>)(|<b>bl</b>)(|<b>rw</b>)</tt>
 	 * <p>
 	 * Note that anything before the first pipe (<tt>|</tt>) character is
 	 * considered to be the encryption key, anything after that character is
@@ -75,16 +77,16 @@ public class RemoteLibrary extends BasicLibrary {
 	 * <li><b><i>yyy</i></b>: the secondary key</li>
 	 * <li><b>rw</b>: flag to allow read and write access if it is not the
 	 * default on this server</li>
-	 * <li><b>wl</b>: flag to allow access to all the stories (bypassing the
-	 * whitelist if it exists)</li>
+	 * <li><b>bl</b>: flag to bypass the blacklist (if it exists)</li>
+	 * <li><b>wl</b>: flag to bypass the whitelist if it exists</li>
 	 * </ul>
 	 * <p>
 	 * Some examples:
 	 * <ul>
 	 * <li><b>my_key</b>: normal connection, will take the default server
 	 * options</li>
-	 * <li><b>my_key|agzyzz|wl</b>: will ask to bypass the white list (if it
-	 * exists)</li>
+	 * <li><b>my_key|agzyzz|wl|bl</b>: will ask to bypass the black list and the
+	 * white list (if it exists)</li>
 	 * <li><b>my_key|agzyzz|rw</b>: will ask read-write access (if the default
 	 * is read-only)</li>
 	 * <li><b>my_key|agzyzz|wl|rw</b>: will ask both read-write access and white
@@ -113,28 +115,33 @@ public class RemoteLibrary extends BasicLibrary {
 			this.subkey = "";
 		}
 
+		if (host.startsWith("fanfix://")) {
+			host = host.substring("fanfix://".length());
+		}
+
 		this.host = host;
 		this.port = port;
 	}
 
 	@Override
 	public String getLibraryName() {
-		return (rw ? "[READ-ONLY] " : "") + host + ":" + port;
+		return (rw ? "[READ-ONLY] " : "") + "fanfix://" + host + ":" + port;
 	}
 
 	@Override
 	public Status getStatus() {
-		Instance.getTraceHandler().trace("Getting remote lib status...");
+		Instance.getInstance().getTraceHandler()
+				.trace("Getting remote lib status...");
 		Status status = getStatusDo();
-		Instance.getTraceHandler().trace("Remote lib status: " + status);
+		Instance.getInstance().getTraceHandler()
+				.trace("Remote lib status: " + status);
 		return status;
 	}
 
 	private Status getStatusDo() {
 		final Status[] result = new Status[1];
 
-		result[0] = Status.INVALID;
-
+		result[0] = null;
 		try {
 			new RemoteConnectAction() {
 				@Override
@@ -180,8 +187,8 @@ public class RemoteLibrary extends BasicLibrary {
 			@Override
 			public void action(ConnectActionClientObject action)
 					throws Exception {
-				Object rep = action.send(new Object[] { subkey, "GET_COVER",
-						luid });
+				Object rep = action
+						.send(new Object[] { subkey, "GET_COVER", luid });
 				result[0] = (Image) rep;
 			}
 		});
@@ -232,8 +239,8 @@ public class RemoteLibrary extends BasicLibrary {
 					pg = new Progress();
 				}
 
-				Object rep = action.send(new Object[] { subkey, "GET_STORY",
-						luid });
+				Object rep = action
+						.send(new Object[] { subkey, "GET_STORY", luid });
 
 				MetaData meta = null;
 				if (rep instanceof MetaData) {
@@ -354,7 +361,7 @@ public class RemoteLibrary extends BasicLibrary {
 	// Could work (more slowly) without it
 	public MetaData imprt(final URL url, Progress pg) throws IOException {
 		// Import the file locally if it is actually a file
-		
+
 		if (url == null || url.getProtocol().equalsIgnoreCase("file")) {
 			return super.imprt(url, pg);
 		}
@@ -374,8 +381,8 @@ public class RemoteLibrary extends BasicLibrary {
 					throws Exception {
 				Progress pg = pgF;
 
-				Object rep = action.send(new Object[] { subkey, "IMPORT",
-						url.toString() });
+				Object rep = action.send(
+						new Object[] { subkey, "IMPORT", url.toString() });
 
 				while (true) {
 					if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -426,7 +433,7 @@ public class RemoteLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public synchronized File getFile(final String luid, Progress pg) {
+	public File getFile(final String luid, Progress pg) {
 		throw new java.lang.InternalError(
 				"Operation not supportorted on remote Libraries");
 	}
@@ -435,20 +442,23 @@ public class RemoteLibrary extends BasicLibrary {
 	 * Stop the server.
 	 * 
 	 * @throws IOException
-	 *             in case of I/O error (including bad key)
+	 *             in case of I/O errors
+	 * @throws SSLException
+	 *             when the key was not accepted
 	 */
-	public void exit() throws IOException {
+	public void stop() throws IOException, SSLException {
 		connectRemoteAction(new RemoteAction() {
 			@Override
 			public void action(ConnectActionClientObject action)
 					throws Exception {
 				action.send(new Object[] { subkey, "EXIT" });
+				Thread.sleep(100);
 			}
 		});
 	}
 
 	@Override
-	public synchronized MetaData getInfo(String luid) throws IOException {
+	public MetaData getInfo(String luid) throws IOException {
 		List<MetaData> metas = getMetasList(luid, null);
 		if (!metas.isEmpty()) {
 			return metas.get(0);
@@ -475,7 +485,7 @@ public class RemoteLibrary extends BasicLibrary {
 	// The following methods are only used by Save and Delete in BasicLibrary:
 
 	@Override
-	protected int getNextId() {
+	protected String getNextId() {
 		throw new java.lang.InternalError("Should not have been called");
 	}
 
@@ -521,8 +531,8 @@ public class RemoteLibrary extends BasicLibrary {
 					pg = new Progress();
 				}
 
-				Object rep = action.send(new Object[] { subkey, "GET_METADATA",
-						luid });
+				Object rep = action
+						.send(new Object[] { subkey, "GET_METADATA", luid });
 
 				while (true) {
 					if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -559,7 +569,7 @@ public class RemoteLibrary extends BasicLibrary {
 				@Override
 				protected void onError(Exception e) {
 					if (!(e instanceof IOException)) {
-						Instance.getTraceHandler().error(e);
+						Instance.getInstance().getTraceHandler().error(e);
 						return;
 					}