X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=62548d678f2b04c6e59e8bb3e455a578e9f68f8c;hb=9b558341bc348212a2b80170cdc76fa9a3b5a334;hp=0378723a403da3942f02322fa0454c5b2c4a63e2;hpb=9b863b20370118c95c6801b73dda951c7e507871;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 0378723..62548d6 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -4,7 +4,11 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLException;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.Chapter;
@@ -14,45 +18,42 @@ import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Progress.ProgressListener;
 import be.nikiroo.utils.StringUtils;
-import be.nikiroo.utils.Version;
 import be.nikiroo.utils.serial.server.ConnectActionServerObject;
 import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
- * Create a new remote server that will listen for order on the given port.
+ * Create a new remote server that will listen for orders on the given port.
  * <p>
- * The available commands are given as arrays of objects (first item is the key,
- * second is the command, the rest are the arguments).
+ * The available commands are given as arrays of objects (first item is the
+ * command, the rest are the arguments).
  * <p>
- * The md5 is always a String (the MD5 hash of the access key), the commands are
- * also Strings; the parameters vary depending upon the command.
  * <ul>
- * <li>[md5] PING: will return PONG if the key is accepted</li>
- * <li>[md5] GET_METADATA *: will return the metadata of all the stories in the
- * library (array)</li>
- * *
- * <li>[md5] GET_METADATA [luid]: will return the metadata of the story of LUID
- * luid</li>
- * <li>[md5] GET_STORY [luid]: will return the given story if it exists (or NULL
- * if not)</li>
- * <li>[md5] SAVE_STORY [luid]: save the story (that must be sent just after the
+ * <li>PING: will return PONG if the key is accepted</li>
+ * <li>GET_METADATA *: will return the metadata of all the stories in the
+ * library (array)</li> *
+ * <li>GET_METADATA [luid]: will return the metadata of the story of LUID luid</li>
+ * <li>GET_STORY [luid]: will return the given story if it exists (or NULL if
+ * not)</li>
+ * <li>SAVE_STORY [luid]: save the story (that must be sent just after the
  * command) with the given LUID, then return the LUID</li>
- * <li>[md5] IMPORT [url]: save the story found at the given URL, then return
- * the LUID</li>
- * <li>[md5] DELETE_STORY [luid]: delete the story of LUID luid</li>
- * <li>[md5] GET_COVER [luid]: return the cover of the story</li>
- * <li>[md5] GET_SOURCE_COVER [source]: return the cover for this source</li>
- * <li>[md5] SET_SOURCE_COVER [source], [luid]: set the default cover for the
- * given source to the cover of the story denoted by luid</li>
- * <li>[md5] CHANGE_SOURCE [luid] [new source]: change the source of the story
- * of LUID luid</li>
- * <li>[md5] EXIT: stop the server</li>
+ * <li>IMPORT [url]: save the story found at the given URL, then return the LUID
+ * </li>
+ * <li>DELETE_STORY [luid]: delete the story of LUID luid</li>
+ * <li>GET_COVER [luid]: return the cover of the story</li>
+ * <li>GET_CUSTOM_COVER ["SOURCE"|"AUTHOR"] [source]: return the cover for this
+ * source/author</li>
+ * <li>SET_COVER ["SOURCE"|"AUTHOR"] [value] [luid]: set the default cover for
+ * the given source/author to the cover of the story denoted by luid</li>
+ * <li>CHANGE_SOURCE [luid] [new source]: change the source of the story of LUID
+ * luid</li>
+ * <li>EXIT: stop the server</li>
  * </ul>
  * 
  * @author niki
  */
 public class RemoteLibraryServer extends ServerObject {
-	private final String md5;
+	private Map<Long, String> commands = new HashMap<Long, String>();
+	private Map<Long, Long> times = new HashMap<Long, Long>();
 
 	/**
 	 * Create a new remote server (will not be active until
@@ -67,48 +68,76 @@ public class RemoteLibraryServer extends ServerObject {
 	 *             in case of I/O error
 	 */
 	public RemoteLibraryServer(String key, int port) throws IOException {
-		super("Fanfix remote library", port, true);
-		this.md5 = StringUtils.getMd5Hash(key);
-
+		super("Fanfix remote library", port, key);
 		setTraceHandler(Instance.getTraceHandler());
 	}
 
 	@Override
-	protected Object onRequest(ConnectActionServerObject action,
-			Version clientVersion, Object data) throws Exception {
-		String md5 = "";
+	protected Object onRequest(ConnectActionServerObject action, Object data,
+			long id) throws Exception {
+		long start = new Date().getTime();
+
 		String command = "";
 		Object[] args = new Object[0];
 		if (data instanceof Object[]) {
 			Object[] dataArray = (Object[]) data;
-			if (dataArray.length >= 2) {
-				md5 = "" + dataArray[0];
-				command = "" + dataArray[1];
+			if (dataArray.length > 0) {
+				command = "" + dataArray[0];
 
-				args = new Object[dataArray.length - 2];
-				for (int i = 2; i < dataArray.length; i++) {
-					args[i - 2] = dataArray[i];
+				args = new Object[dataArray.length - 1];
+				for (int i = 1; i < dataArray.length; i++) {
+					args[i - 1] = dataArray[i];
 				}
 			}
 		}
 
-		String trace = "[" + command + "] ";
+		String trace = "[ " + command + "] ";
 		for (Object arg : args) {
 			trace += arg + " ";
 		}
-		getTraceHandler().trace(trace);
+		System.out.println(trace);
 
-		if (!md5.equals(this.md5)) {
-			getTraceHandler().trace("Key rejected.");
-			return null;
-		}
+		Object rep = doRequest(action, command, args);
+
+		commands.put(id, command);
+		times.put(id, (new Date().getTime() - start));
+
+		return rep;
+	}
 
+	@Override
+	protected void onRequestDone(long id, long bytesReceived, long bytesSent) {
+		String rec = StringUtils.formatNumber(bytesReceived) + "b";
+		String sent = StringUtils.formatNumber(bytesSent) + "b";
+		System.out.println(String.format("[>%s]: (%s sent, %s rec) in %d ms",
+				commands.get(id), sent, rec, times.get(id)));
+		commands.remove(id);
+		times.remove(id);
+	}
+
+	private Object doRequest(ConnectActionServerObject action, String command,
+			Object[] args) throws NoSuchFieldException, NoSuchMethodException,
+			ClassNotFoundException, IOException {
 		if ("PING".equals(command)) {
 			return "PONG";
 		} else if ("GET_METADATA".equals(command)) {
 			if ("*".equals(args[0])) {
 				Progress pg = createPgForwarder(action);
-				List<MetaData> metas = Instance.getLibrary().getMetas(pg);
+
+				List<MetaData> metas = new ArrayList<MetaData>();
+
+				for (MetaData meta : Instance.getLibrary().getMetas(pg)) {
+					MetaData light;
+					if (meta.getCover() == null) {
+						light = meta;
+					} else {
+						light = meta.clone();
+						light.setCover(null);
+					}
+
+					metas.add(light);
+				}
+
 				forcePgDoneSent(pg);
 				return metas.toArray(new MetaData[] {});
 			}
@@ -153,15 +182,28 @@ public class RemoteLibraryServer extends ServerObject {
 			Instance.getLibrary().delete((String) args[0]);
 		} else if ("GET_COVER".equals(command)) {
 			return Instance.getLibrary().getCover((String) args[0]);
-		} else if ("GET_SOURCE_COVER".equals(command)) {
-			return Instance.getLibrary().getSourceCover((String) args[0]);
-		} else if ("SET_SOURCE_COVER".equals(command)) {
-			Instance.getLibrary().setSourceCover((String) args[0],
-					(String) args[1]);
-		} else if ("CHANGE_SOURCE".equals(command)) {
+		} else if ("GET_CUSTOM_COVER".equals(command)) {
+			if ("SOURCE".equals(args[0])) {
+				return Instance.getLibrary().getCustomSourceCover(
+						(String) args[1]);
+			} else if ("AUTHOR".equals(args[0])) {
+				return Instance.getLibrary().getCustomAuthorCover(
+						(String) args[1]);
+			} else {
+				return null;
+			}
+		} else if ("SET_COVER".equals(command)) {
+			if ("SOURCE".equals(args[0])) {
+				Instance.getLibrary().setSourceCover((String) args[1],
+						(String) args[2]);
+			} else if ("AUTHOR".equals(args[0])) {
+				Instance.getLibrary().setAuthorCover((String) args[1],
+						(String) args[2]);
+			}
+		} else if ("CHANGE_STA".equals(command)) {
 			Progress pg = createPgForwarder(action);
-			Instance.getLibrary().changeSource((String) args[0],
-					(String) args[1], pg);
+			Instance.getLibrary().changeSTA((String) args[0], (String) args[1],
+					(String) args[2], (String) args[3], pg);
 			forcePgDoneSent(pg);
 		} else if ("EXIT".equals(command)) {
 			stop(0, false);
@@ -172,7 +214,11 @@ public class RemoteLibraryServer extends ServerObject {
 
 	@Override
 	protected void onError(Exception e) {
-		getTraceHandler().error(e);
+		if (e instanceof SSLException) {
+			System.out.println("[Client connection refused (bad key)]");
+		} else {
+			getTraceHandler().error(e);
+		}
 	}
 
 	/**
@@ -267,8 +313,7 @@ public class RemoteLibraryServer extends ServerObject {
 	 * 
 	 * @return the {@link Progress}
 	 */
-	private static Progress createPgForwarder(
-			final ConnectActionServerObject action) {
+	private Progress createPgForwarder(final ConnectActionServerObject action) {
 		final Boolean[] isDoneForwarded = new Boolean[] { false };
 		final Progress pg = new Progress() {
 			@Override
@@ -301,12 +346,13 @@ public class RemoteLibraryServer extends ServerObject {
 						action.send(new Integer[] { min, max, relativeProgress });
 						action.rec();
 					} catch (Exception e) {
-						Instance.getTraceHandler().error(e);
+						getTraceHandler().error(e);
 					}
 
-					isDoneForwarded[0] = pg.isDone();
 					lastTime[0] = new Date().getTime();
 				}
+
+				isDoneForwarded[0] = (pg.getProgress() >= pg.getMax());
 			}
 		});
 
@@ -314,14 +360,14 @@ public class RemoteLibraryServer extends ServerObject {
 	}
 
 	// with 30 seconds timeout
-	private static void forcePgDoneSent(Progress pg) {
+	private void forcePgDoneSent(Progress pg) {
 		long start = new Date().getTime();
 		pg.done();
 		while (!pg.isDone() && new Date().getTime() - start < 30000) {
 			try {
 				Thread.sleep(100);
 			} catch (InterruptedException e) {
-				Instance.getTraceHandler().error(e);
+				getTraceHandler().error(e);
 			}
 		}
 	}