X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=0378723a403da3942f02322fa0454c5b2c4a63e2;hb=9b863b20370118c95c6801b73dda951c7e507871;hp=c93f0f35c600b90a05ded37322da4751f90a0d4e;hpb=0fa0fe9552e57bf05d8dd295a9d96d2364730c4e;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index c93f0f3..0378723 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -1,8 +1,9 @@ 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; @@ -28,16 +29,23 @@ import be.nikiroo.utils.serial.server.ServerObject; * * @@ -74,13 +82,13 @@ public class RemoteLibraryServer extends ServerObject { 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]; } - - md5 = "" + dataArray[0]; - command = "" + dataArray[1]; } } @@ -99,12 +107,14 @@ public class RemoteLibraryServer extends ServerObject { return "PONG"; } else if ("GET_METADATA".equals(command)) { if ("*".equals(args[0])) { - List metas = Instance.getLibrary().getMetas( - createPgForwarder(action)); + Progress pg = createPgForwarder(action); + List 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((String) args[0]); meta = meta.clone(); @@ -133,6 +143,12 @@ public class RemoteLibraryServer extends ServerObject { Story story = rebuildStory(list); 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((String) args[0]); } else if ("GET_COVER".equals(command)) { @@ -142,6 +158,11 @@ public class RemoteLibraryServer extends ServerObject { } else if ("SET_SOURCE_COVER".equals(command)) { 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); } @@ -248,8 +269,16 @@ public class RemoteLibraryServer extends ServerObject { */ 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) { @@ -259,8 +288,11 @@ public class RemoteLibraryServer extends ServerObject { + (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; @@ -271,10 +303,26 @@ public class RemoteLibraryServer extends ServerObject { } 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); + } + } + } }