X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=b26899930bc35e806634536c57d4882d111e6332;hp=661bf54d61b8100d0b00a964b9016f77945666c8;hb=2a25f7814eec9854022f1c9dee188bfbdb955591;hpb=a85e807750081c6e77a7916ca4e79506b5a98537

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 661bf54..b268999 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,70 +1,113 @@
 package be.nikiroo.fanfix.library;
 
 import java.io.IOException;
+import java.security.InvalidParameterException;
 import java.util.List;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionServer;
-import be.nikiroo.utils.serial.Server;
+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.
  * <p>
- * The available commands are:
+ * The available commands are given as arrays of objects (first item is the key,
+ * second is the command, the rest are the arguments).
+ * <p>
+ * The key is always a String, the commands are also Strings; the parameters
+ * vary depending upon the command.
  * <ul>
- * <li>GET_METADATA *: will get the metadata of all the stories in the library</li>
- * <li>GET_STORY [luid]: will return the given story if it exists (or NULL if
- * not)</li>
+ * <li>[key] GET_METADATA *: will return the metadata of all the stories in the
+ * library</li>
+ * <li>[key] GET_STORY [luid]: will return the given story if it exists (or NULL
+ * if not)</li>
+ * <li>[key] SAVE_STORY [story] [luid]: save the story with the given LUID</li>
+ * <li>[key] DELETE_STORY [luid]: delete the story of LUID luid</li>
+ * <li>[key] GET_COVER [luid]: return the cover of the story</li>
+ * <li>[key] GET_SOURCE_COVER [source]: return the cover for this source</li>
+ * <li>[key] SET_SOURCE_COVER [source], [luid]: set the default cover for the
+ * given source to the cover of the story denoted by luid</li>
+ * <li>[key] EXIT: stop the server</li>
  * </ul>
  * 
  * @author niki
  */
-public class RemoteLibraryServer extends Server {
+public class RemoteLibraryServer extends ServerObject {
+	private final String key;
 
 	/**
 	 * Create a new remote server (will not be active until
 	 * {@link RemoteLibraryServer#start()} is called).
 	 * 
+	 * @param key
+	 *            the key that will restrict access to this server
 	 * @param port
 	 *            the port to listen on
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	public RemoteLibraryServer(int port) throws IOException {
+	public RemoteLibraryServer(String key, int port) throws IOException {
 		super(port, true);
+		this.key = key;
 	}
 
 	@Override
-	protected Object onRequest(ConnectActionServer action,
+	protected Object onRequest(ConnectActionServerObject action,
 			Version clientVersion, Object data) throws Exception {
-		String command = null;
-		String args = null;
-		if (data instanceof String) {
-			command = (String) data;
-			int pos = command.indexOf(" ");
-			if (pos >= 0) {
-				args = command.substring(pos + 1);
-				command = command.substring(0, pos);
+		String key = "";
+		String command = "";
+		Object[] args = new Object[0];
+		if (data instanceof Object[]) {
+			Object[] dataArray = (Object[]) data;
+			if (dataArray.length >= 2) {
+				args = new Object[dataArray.length - 2];
+				for (int i = 2; i < dataArray.length; i++) {
+					args[i - 2] = dataArray[i];
+				}
+
+				key = "" + dataArray[0];
+				command = "" + dataArray[1];
 			}
 		}
 
-		System.out.println(String.format("COMMAND: [%s], ARGS: [%s]", command,
-				args));
+		System.out.print("[" + command + "] ");
+		for (Object arg : args) {
+			System.out.print(arg + " ");
+		}
+		System.out.println("");
+
+		if (!key.equals(this.key)) {
+			System.out.println("Key rejected.");
+			throw new SecurityException("Invalid key");
+		}
 
 		// TODO: progress (+send name + %age info back to client)
 
 		if ("GET_METADATA".equals(command)) {
-			if (args != null && args.equals("*")) {
+			if (args[0].equals("*")) {
 				List<MetaData> metas = Instance.getLibrary().getMetas(null);
 				return metas.toArray(new MetaData[] {});
 			}
+			throw new InvalidParameterException(
+					"only * is valid here, but you passed: " + args[0]);
 		} else if ("GET_STORY".equals(command)) {
-			if (args != null) {
-				return Instance.getLibrary().getStory(args, null);
-			}
+			return Instance.getLibrary().getStory("" + args[0], null);
+		} else if ("SAVE_STORY".equals(command)) {
+			Instance.getLibrary().save((Story) args[0], "" + args[1], null);
+		} else if ("DELETE_STORY".equals(command)) {
+			Instance.getLibrary().delete("" + args[0]);
+		} else if ("GET_COVER".equals(command)) {
+			return Instance.getLibrary().getCover("" + args[0]);
+		} else if ("GET_SOURCE_COVER".equals(command)) {
+			return Instance.getLibrary().getSourceCover("" + args[0]);
+		} else if ("SET_SOURCE_COVER".equals(command)) {
+			Instance.getLibrary().setSourceCover("" + args[0], "" + args[1]);
+		} else if ("EXIT".equals(command)) {
+			stop(0, false);
 		}
 
 		return null;