X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=5bbe4cdd1f33b77bb67e609b91b7770aa886a35e;hb=2070ced5a252b11ae7e19be1bb2430fa8e9220d9;hp=566c70fa69a572043ea6749ae5361b05b6ac4b73;hpb=e42573a004fac26378c693ce9ef0d6319713c682;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index 566c70f..5bbe4cd 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -1,48 +1,111 @@ 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; +/** + * Create a new remote server that will listen for order on the given port. + *

+ * The available commands are given as String arrays (first item is the key, + * second is the command, the rest are the arguments): + *

+ * + * @author niki + */ public class RemoteLibraryServer extends Server { + private final String key; - public RemoteLibraryServer(int port) throws IOException { - super(Version.getCurrentVersion(), port, true); + /** + * 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(String key, int port) throws IOException { + super(port, true); + this.key = key; } @Override protected Object onRequest(ConnectActionServer 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] = 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 (command != null) { - if (command.equals("GET_METADATA")) { - if (args != null && args.equals("*")) { - List metas = Instance.getLibrary().getMetas(null); - return metas.toArray(new MetaData[] {}); - } - } else if (command.equals("GET_STORY")) { - if (args != null) { - return Instance.getLibrary().getStory(args, null); - } + 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[0].equals("*")) { + List 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)) { + 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;