gui: change name, author

[fanfix.git] / src / be / nikiroo / fanfix / library / RemoteLibraryServer.java

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 138246ae47044a33399b132ac6c619ca320083df..aa5f3056a2536981850498c17fb5a6e560bd1f4f 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -3,6 +3,7 @@ package be.nikiroo.fanfix.library;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import be.nikiroo.fanfix.Instance;
@@ -40,7 +41,7 @@ import be.nikiroo.utils.serial.server.ServerObject;
  * 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] 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>[md5] CHANGE_SOURCE [luid] [new source]: change the source of the story
@@ -91,7 +92,7 @@ public class RemoteLibraryServer extends ServerObject {
                        }
                }
 
-               String trace = "[" + command + "] ";
+               String trace = "[ " + command + "] ";
                for (Object arg : args) {
                        trace += arg + " ";
                }
@@ -102,12 +103,40 @@ public class RemoteLibraryServer extends ServerObject {
                        return null;
                }
 
+               long start = new Date().getTime();
+               Object rep = doRequest(action, command, args);
+
+               getTraceHandler().trace(
+                               String.format("[>%s]: %d ms", command,
+                                               (new Date().getTime() - start)));
+
+               return rep;
+       }
+
+       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])) {
-                               List<MetaData> metas = Instance.getLibrary().getMetas(
-                                               createPgForwarder(action));
+                               Progress pg = createPgForwarder(action);
+
+                               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[] {});
                        }
 
@@ -142,21 +171,25 @@ public class RemoteLibraryServer extends ServerObject {
                        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]), createPgForwarder(action));
+                                       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)) {
                        return Instance.getLibrary().getCover((String) args[0]);
-               } else if ("GET_SOURCE_COVER".equals(command)) {
-                       return Instance.getLibrary().getSourceCover((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((String) args[0],
                                        (String) args[1]);
-               } else if ("CHANGE_SOURCE".equals(command)) {
-                       Instance.getLibrary().changeSource((String) args[0],
-                                       (String) args[1], createPgForwarder(action));
+               } else if ("CHANGE_STA".equals(command)) {
+                       Progress pg = createPgForwarder(action);
+                       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);
                }
@@ -178,8 +211,6 @@ public class RemoteLibraryServer extends ServerObject {
         * @return the list of {@link Object}s
         */
        static List<Object> breakStory(Story story) {
-               System.out.println("Story to break: "+story);
-               
                List<Object> list = new ArrayList<Object>();
 
                story = story.clone();
@@ -220,7 +251,6 @@ public class RemoteLibraryServer extends ServerObject {
                        }
                }
 
-               System.out.println("rebuilt story: "+story);
                return story;
        }
 
@@ -266,8 +296,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) {
@@ -277,8 +315,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;
@@ -289,10 +330,27 @@ public class RemoteLibraryServer extends ServerObject {
                                        } catch (Exception e) {
                                                Instance.getTraceHandler().error(e);
                                        }
+
+                                       lastTime[0] = new Date().getTime();
                                }
+
+                               isDoneForwarded[0] = (pg.getProgress() >= pg.getMax());
                        }
                });
 
                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);
+                       }
+               }
+       }
 }