X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=077a857cf9a748ddbd242b1af625b853ecf6d75e;hb=5db598bc6386aaabe69f2eed55b03625c72c236b;hp=44d39adbcc30d8b6867aaf5fd4961ac0dc00bac9;hpb=efa3c511f39ab1432675e3b75b9b7b32d579f1c3;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index 44d39ad..077a857 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -7,12 +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;
 
@@ -24,12 +25,78 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject;
  * @author niki
  */
 public class RemoteLibrary extends BasicLibrary {
+	interface RemoteAction {
+		public void action(ConnectActionClientObject action) throws Exception;
+	}
+
+	class RemoteConnectAction extends ConnectActionClientObject {
+		public RemoteConnectAction() throws IOException {
+			super(host, port, key);
+		}
+
+		@Override
+		public Object send(Object data) throws IOException,
+				NoSuchFieldException, NoSuchMethodException,
+				ClassNotFoundException {
+			Object rep = super.send(data);
+			if (rep instanceof RemoteLibraryException) {
+				RemoteLibraryException remoteEx = (RemoteLibraryException) rep;
+				IOException cause = remoteEx.getCause();
+				if (cause == null) {
+					cause = new IOException("IOException");
+				}
+
+				throw cause;
+			}
+
+			return rep;
+		}
+	}
+
 	private String host;
 	private int port;
-	private final String md5;
+	private final String key;
+	private final String subkey;
+
+	// informative only (server will make the actual checks)
+	private boolean rw;
+
+	// TODO: error handling is not up to par!
 
 	/**
 	 * 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>
+	 * <p>
+	 * Note that anything before the first pipe (<tt>|</tt>) character is
+	 * considered to be the encryption key, anything after that character is
+	 * called the subkey (including the other pipe characters and flags!).
+	 * <p>
+	 * This is important because the subkey (including the pipe characters and
+	 * flags) must be present as-is in the server configuration file to be
+	 * allowed.
+	 * <ul>
+	 * <li><b><i>xxx</i></b>: the encryption key used to communicate with the
+	 * server</li>
+	 * <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>
+	 * </ul>
+	 * 
+	 * 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|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
+	 * list bypass</li>
+	 * </ul>
 	 * 
 	 * @param key
 	 *            the key that will allow us to exchange information with the
@@ -40,7 +107,19 @@ public class RemoteLibrary extends BasicLibrary {
 	 *            the port to contact it on
 	 */
 	public RemoteLibrary(String key, String host, int port) {
-		this.md5 = StringUtils.getMd5Hash(key);
+		int index = -1;
+		if (key != null) {
+			index = key.indexOf('|');
+		}
+
+		if (index >= 0) {
+			this.key = key.substring(0, index);
+			this.subkey = key.substring(index + 1);
+		} else {
+			this.key = key;
+			this.subkey = "";
+		}
+
 		this.host = host;
 		this.port = port;
 	}
@@ -52,29 +131,43 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public Status getStatus() {
+		Instance.getTraceHandler().trace("Getting remote lib status...");
+		Status status = getStatusDo();
+		Instance.getTraceHandler().trace("Remote lib status: " + status);
+		return status;
+	}
+
+	private Status getStatusDo() {
 		final Status[] result = new Status[1];
 
 		result[0] = Status.INVALID;
 
-		ConnectActionClientObject action = null;
 		try {
-			action = new ConnectActionClientObject(host, port, true) {
+			new RemoteConnectAction() {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { md5, "PING" });
-					if ("PONG".equals(rep)) {
+					Object rep = send(new Object[] { subkey, "PING" });
+
+					if ("r/w".equals(rep)) {
+						rw = true;
+						result[0] = Status.READY;
+					} else if ("r/o".equals(rep)) {
+						rw = false;
 						result[0] = Status.READY;
 					} else {
-						result[0] = Status.UNAUTORIZED;
+						result[0] = Status.UNAUTHORIZED;
 					}
 				}
 
 				@Override
 				protected void onError(Exception e) {
-					result[0] = Status.UNAVAILABLE;
+					if (e instanceof SSLException) {
+						result[0] = Status.UNAUTHORIZED;
+					} else {
+						result[0] = Status.UNAVAILABLE;
+					}
 				}
-			};
-
+			}.connect();
 		} catch (UnknownHostException e) {
 			result[0] = Status.INVALID;
 		} catch (IllegalArgumentException e) {
@@ -83,14 +176,6 @@ public class RemoteLibrary extends BasicLibrary {
 			result[0] = Status.UNAVAILABLE;
 		}
 
-		if (action != null) {
-			try {
-				action.connect();
-			} catch (Exception e) {
-				result[0] = Status.UNAVAILABLE;
-			}
-		}
-
 		return result[0];
 	}
 
@@ -98,47 +183,42 @@ public class RemoteLibrary extends BasicLibrary {
 	public Image getCover(final String luid) {
 		final Image[] result = new Image[1];
 
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { md5, "GET_COVER", luid });
-					result[0] = (Image) rep;
-				}
-
-				@Override
-				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
-				}
-			}.connect();
-		} catch (Exception e) {
-			Instance.getTraceHandler().error(e);
-		}
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				Object rep = action.send(new Object[] { subkey, "GET_COVER",
+						luid });
+				result[0] = (Image) rep;
+			}
+		});
 
 		return result[0];
 	}
 
 	@Override
-	public Image getSourceCover(final String source) {
-		final Image[] result = new Image[1];
+	public Image getCustomSourceCover(final String source) {
+		return getCustomCover(source, "SOURCE");
+	}
 
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { md5, "GET_SOURCE_COVER",
-							source });
-					result[0] = (Image) rep;
-				}
+	@Override
+	public Image getCustomAuthorCover(final String author) {
+		return getCustomCover(author, "AUTHOR");
+	}
 
-				@Override
-				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
-				}
-			}.connect();
-		} catch (Exception e) {
-			Instance.getTraceHandler().error(e);
-		}
+	// type: "SOURCE" or "AUTHOR"
+	private Image getCustomCover(final String source, final String type) {
+		final Image[] result = new Image[1];
+
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				Object rep = action.send(new Object[] { subkey,
+						"GET_CUSTOM_COVER", type, source });
+				result[0] = (Image) rep;
+			}
+		});
 
 		return result[0];
 	}
@@ -148,43 +228,37 @@ public class RemoteLibrary extends BasicLibrary {
 		final Progress pgF = pg;
 		final Story[] result = new Story[1];
 
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					Progress pg = pgF;
-					if (pg == null) {
-						pg = new Progress();
-					}
-
-					Object rep = send(new Object[] { md5, "GET_STORY", luid });
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				Progress pg = pgF;
+				if (pg == null) {
+					pg = new Progress();
+				}
 
-					MetaData meta = null;
-					if (rep instanceof MetaData) {
-						meta = (MetaData) rep;
-						if (meta.getWords() <= Integer.MAX_VALUE) {
-							pg.setMinMax(0, (int) meta.getWords());
-						}
-					}
+				Object rep = action.send(new Object[] { subkey, "GET_STORY",
+						luid });
 
-					List<Object> list = new ArrayList<Object>();
-					for (Object obj = send(null); obj != null; obj = send(null)) {
-						list.add(obj);
-						pg.add(1);
+				MetaData meta = null;
+				if (rep instanceof MetaData) {
+					meta = (MetaData) rep;
+					if (meta.getWords() <= Integer.MAX_VALUE) {
+						pg.setMinMax(0, (int) meta.getWords());
 					}
-
-					result[0] = RemoteLibraryServer.rebuildStory(list);
-					pg.done();
 				}
 
-				@Override
-				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+				List<Object> list = new ArrayList<Object>();
+				for (Object obj = action.send(null); obj != null; obj = action
+						.send(null)) {
+					list.add(obj);
+					pg.add(1);
 				}
-			}.connect();
-		} catch (Exception e) {
-			Instance.getTraceHandler().error(e);
-		}
+
+				result[0] = RemoteLibraryServer.rebuildStory(list);
+				pg.done();
+			}
+		});
 
 		return result[0];
 	}
@@ -192,6 +266,7 @@ public class RemoteLibrary extends BasicLibrary {
 	@Override
 	public synchronized Story save(final Story story, final String luid,
 			Progress pg) throws IOException {
+
 		final String[] luidSaved = new String[1];
 		Progress pgSave = new Progress();
 		Progress pgRefresh = new Progress();
@@ -205,32 +280,28 @@ public class RemoteLibrary extends BasicLibrary {
 
 		final Progress pgF = pgSave;
 
-		new ConnectActionClientObject(host, port, true) {
+		connectRemoteAction(new RemoteAction() {
 			@Override
-			public void action(Version serverVersion) throws Exception {
+			public void action(ConnectActionClientObject action)
+					throws Exception {
 				Progress pg = pgF;
 				if (story.getMeta().getWords() <= Integer.MAX_VALUE) {
 					pg.setMinMax(0, (int) story.getMeta().getWords());
 				}
 
-				send(new Object[] { md5, "SAVE_STORY", luid });
+				action.send(new Object[] { subkey, "SAVE_STORY", luid });
 
 				List<Object> list = RemoteLibraryServer.breakStory(story);
 				for (Object obj : list) {
-					send(obj);
+					action.send(obj);
 					pg.add(1);
 				}
 
-				luidSaved[0] = (String) send(null);
+				luidSaved[0] = (String) action.send(null);
 
 				pg.done();
 			}
-
-			@Override
-			protected void onError(Exception e) {
-				Instance.getTraceHandler().error(e);
-			}
-		}.connect();
+		});
 
 		// because the meta changed:
 		MetaData meta = getInfo(luidSaved[0]);
@@ -250,41 +321,48 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public synchronized void delete(final String luid) throws IOException {
-		new ConnectActionClientObject(host, port, true) {
+		connectRemoteAction(new RemoteAction() {
 			@Override
-			public void action(Version serverVersion) throws Exception {
-				send(new Object[] { md5, "DELETE_STORY", luid });
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				action.send(new Object[] { subkey, "DELETE_STORY", luid });
 			}
-
-			@Override
-			protected void onError(Exception e) {
-				Instance.getTraceHandler().error(e);
-			}
-		}.connect();
+		});
 	}
 
 	@Override
 	public void setSourceCover(final String source, final String luid) {
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					send(new Object[] { md5, "SET_SOURCE_COVER", source, luid });
-				}
+		setCover(source, luid, "SOURCE");
+	}
 
-				@Override
-				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
-				}
-			}.connect();
-		} catch (IOException e) {
-			Instance.getTraceHandler().error(e);
-		}
+	@Override
+	public void setAuthorCover(final String author, final String luid) {
+		setCover(author, luid, "AUTHOR");
+	}
+
+	// type = "SOURCE" | "AUTHOR"
+	private void setCover(final String value, final String luid,
+			final String type) {
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				action.send(new Object[] { subkey, "SET_COVER", type, value,
+						luid });
+			}
+		});
 	}
 
 	@Override
 	// Could work (more slowly) without it
 	public Story 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);
+		}
+
+		// Import it remotely if it is an URL
+
 		if (pg == null) {
 			pg = new Progress();
 		}
@@ -298,35 +376,27 @@ public class RemoteLibrary extends BasicLibrary {
 		final Progress pgF = pgImprt;
 		final String[] luid = new String[1];
 
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					Progress pg = pgF;
-
-					Object rep = send(new Object[] { md5, "IMPORT",
-							url.toString() });
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				Progress pg = pgF;
 
-					while (true) {
-						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
-							break;
-						}
+				Object rep = action.send(new Object[] { subkey, "IMPORT",
+						url.toString() });
 
-						rep = send(null);
+				while (true) {
+					if (!RemoteLibraryServer.updateProgress(pg, rep)) {
+						break;
 					}
 
-					pg.done();
-					luid[0] = (String) rep;
+					rep = action.send(null);
 				}
 
-				@Override
-				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
-				}
-			}.connect();
-		} catch (IOException e) {
-			Instance.getTraceHandler().error(e);
-		}
+				pg.done();
+				luid[0] = (String) rep;
+			}
+		});
 
 		if (luid[0] == null) {
 			throw new IOException("Remote failure");
@@ -341,35 +411,29 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	// Could work (more slowly) without it
-	public synchronized void changeSource(final String luid,
-			final String newSource, Progress pg) throws IOException {
-		final Progress pgF = pg == null ? new Progress() : pg;
+	protected synchronized void changeSTA(final String luid,
+			final String newSource, final String newTitle,
+			final String newAuthor, Progress pg) throws IOException {
 
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					Progress pg = pgF;
+		final Progress pgF = pg == null ? new Progress() : pg;
 
-					Object rep = send(new Object[] { md5, "CHANGE_SOURCE",
-							luid, newSource });
-					while (true) {
-						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
-							break;
-						}
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				Progress pg = pgF;
 
-						rep = send(null);
+				Object rep = action.send(new Object[] { subkey, "CHANGE_STA",
+						luid, newSource, newTitle, newAuthor });
+				while (true) {
+					if (!RemoteLibraryServer.updateProgress(pg, rep)) {
+						break;
 					}
-				}
 
-				@Override
-				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
+					rep = action.send(null);
 				}
-			}.connect();
-		} catch (IOException e) {
-			Instance.getTraceHandler().error(e);
-		}
+			}
+		});
 	}
 
 	@Override
@@ -382,21 +446,13 @@ public class RemoteLibrary extends BasicLibrary {
 	 * Stop the server.
 	 */
 	public void exit() {
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					send(new Object[] { md5, "EXIT" });
-				}
-
-				@Override
-				protected void onError(Exception e) {
-					Instance.getTraceHandler().error(e);
-				}
-			}.connect();
-		} catch (IOException e) {
-			Instance.getTraceHandler().error(e);
-		}
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				action.send(new Object[] { subkey, "EXIT" });
+			}
+		});
 	}
 
 	@Override
@@ -420,7 +476,7 @@ public class RemoteLibrary extends BasicLibrary {
 	}
 
 	@Override
-	protected void deleteInfo(String luid) {
+	protected void invalidateInfo(String luid) {
 		// Will be taken care of directly server side
 	}
 
@@ -446,6 +502,8 @@ public class RemoteLibrary extends BasicLibrary {
 	/**
 	 * Return the meta of the given story or a list of all known metas if the
 	 * luid is "*".
+	 * <p>
+	 * Will not get the covers.
 	 * 
 	 * @param luid
 	 *            the luid of the story or *
@@ -459,43 +517,62 @@ public class RemoteLibrary extends BasicLibrary {
 		final Progress pgF = pg;
 		final List<MetaData> metas = new ArrayList<MetaData>();
 
-		try {
-			new ConnectActionClientObject(host, port, true) {
-				@Override
-				public void action(Version serverVersion) throws Exception {
-					Progress pg = pgF;
-					if (pg == null) {
-						pg = new Progress();
-					}
-
-					Object rep = send(new Object[] { md5, "GET_METADATA", luid });
+		connectRemoteAction(new RemoteAction() {
+			@Override
+			public void action(ConnectActionClientObject action)
+					throws Exception {
+				Progress pg = pgF;
+				if (pg == null) {
+					pg = new Progress();
+				}
 
-					while (true) {
-						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
-							break;
-						}
+				Object rep = action.send(new Object[] { subkey, "GET_METADATA",
+						luid });
 
-						rep = send(null);
+				while (true) {
+					if (!RemoteLibraryServer.updateProgress(pg, rep)) {
+						break;
 					}
 
-					if (rep instanceof MetaData[]) {
-						for (MetaData meta : (MetaData[]) rep) {
-							metas.add(meta);
-						}
-					} else if (rep != null) {
-						metas.add((MetaData) rep);
+					rep = action.send(null);
+				}
+
+				if (rep instanceof MetaData[]) {
+					for (MetaData meta : (MetaData[]) rep) {
+						metas.add(meta);
 					}
+				} else if (rep != null) {
+					metas.add((MetaData) rep);
+				}
+			}
+		});
+
+		return metas;
+	}
+
+	private void connectRemoteAction(final RemoteAction runAction) {
+		try {
+			final RemoteConnectAction[] array = new RemoteConnectAction[1];
+			RemoteConnectAction ra = new RemoteConnectAction() {
+				@Override
+				public void action(Version serverVersion) throws Exception {
+					runAction.action(array[0]);
 				}
 
 				@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();
+			};
+			array[0] = ra;
+			ra.connect();
 		} catch (Exception e) {
 			Instance.getTraceHandler().error(e);
 		}
-
-		return metas;
 	}
 }