package be.nikiroo.fanfix.library;
import java.io.IOException;
-import java.security.InvalidParameterException;
+import java.net.URL;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import be.nikiroo.fanfix.Instance;
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;
* 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.
+ * 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>[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
+ * <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>[key] SAVE_STORY [luid]: save the story (that must be sent just after the
- * command) 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
+ * <li>[md5] 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_CUSTOM_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>[key] EXIT: stop the server</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>
* </ul>
*
* @author niki
*/
public class RemoteLibraryServer extends ServerObject {
- private final String key;
+ private final String md5;
/**
* Create a new remote server (will not be active until
*/
public RemoteLibraryServer(String key, int port) throws IOException {
super("Fanfix remote library", port, true);
- this.key = key;
+ this.md5 = StringUtils.getMd5Hash(key);
setTraceHandler(Instance.getTraceHandler());
}
@Override
protected Object onRequest(ConnectActionServerObject action,
Version clientVersion, Object data) throws Exception {
- String key = "";
+ String md5 = "";
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];
+
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];
}
}
}
getTraceHandler().trace(trace);
- if (!key.equals(this.key)) {
+ if (!md5.equals(this.md5)) {
getTraceHandler().trace("Key rejected.");
return null;
}
- if ("GET_METADATA".equals(command)) {
- if (args[0].equals("*")) {
- List<MetaData> metas = Instance.getLibrary().getMetas(
- createPgForwarder(action));
+ 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);
+ forcePgDoneSent(pg);
return metas.toArray(new MetaData[] {});
}
- throw new InvalidParameterException(
- "only * is valid here, but you passed: " + args[0]);
+
+ return new MetaData[] { Instance.getLibrary().getInfo(
+ (String) args[0]) };
} else if ("GET_STORY".equals(command)) {
- MetaData meta = Instance.getLibrary().getInfo("" + args[0]);
+ MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
meta = meta.clone();
meta.setCover(null);
action.send(meta);
action.rec();
- Story story = Instance.getLibrary().getStory("" + args[0], null);
+ Story story = Instance.getLibrary()
+ .getStory((String) args[0], null);
for (Object obj : breakStory(story)) {
action.send(obj);
action.rec();
}
Story story = rebuildStory(list);
- Instance.getLibrary().save(story, "" + args[1], null);
+ Instance.getLibrary().save(story, (String) args[0], null);
+ return story.getMeta().getLuid();
+ } else if ("IMPORT".equals(command)) {
+ Progress pg = createPgForwarder(action);
+ Story story = Instance.getLibrary().imprt(
+ new URL((String) args[0]), pg);
+ forcePgDoneSent(pg);
+ return story.getMeta().getLuid();
} else if ("DELETE_STORY".equals(command)) {
- Instance.getLibrary().delete("" + args[0]);
+ Instance.getLibrary().delete((String) 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]);
+ return Instance.getLibrary().getCover((String) args[0]);
+ } else if ("GET_CUSTOM_SOURCE_COVER".equals(command)) {
+ return Instance.getLibrary().getCustomSourceCover((String) args[0]);
} else if ("SET_SOURCE_COVER".equals(command)) {
- Instance.getLibrary().setSourceCover("" + args[0], "" + args[1]);
+ Instance.getLibrary().setSourceCover((String) args[0],
+ (String) args[1]);
+ } else if ("CHANGE_SOURCE".equals(command)) {
+ Progress pg = createPgForwarder(action);
+ Instance.getLibrary().changeSource((String) args[0],
+ (String) args[1], pg);
+ forcePgDoneSent(pg);
} else if ("EXIT".equals(command)) {
stop(0, false);
}
*/
private static Progress createPgForwarder(
final ConnectActionServerObject action) {
- final Progress pg = new Progress();
+ final Boolean[] isDoneForwarded = new Boolean[] { false };
+ final Progress pg = new Progress() {
+ @Override
+ public boolean isDone() {
+ return isDoneForwarded[0];
+ }
+ };
+
final Integer[] p = new Integer[] { -1, -1, -1 };
+ final Long[] lastTime = new Long[] { new Date().getTime() };
pg.addProgressListener(new ProgressListener() {
@Override
public void progress(Progress progress, String name) {
+ (int) Math.round(pg.getRelativeProgress()
* (max - min));
- // Do not re-send the same value twice over the wire
- if (p[0] != min || p[1] != max || p[2] != relativeProgress) {
+ // Do not re-send the same value twice over the wire,
+ // unless more than 2 seconds have elapsed (to maintain the
+ // connection)
+ if ((p[0] != min || p[1] != max || p[2] != relativeProgress)
+ || (new Date().getTime() - lastTime[0] > 2000)) {
p[0] = min;
p[1] = max;
p[2] = relativeProgress;
} catch (Exception e) {
Instance.getTraceHandler().error(e);
}
+
+ isDoneForwarded[0] = pg.isDone();
+ lastTime[0] = new Date().getTime();
}
}
});
return pg;
}
+
+ // with 30 seconds timeout
+ private static 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);
+ }
+ }
+ }
}
git://git.nikiroo.be / fanfix.git / blobdiff