Update nikiroo-utils, remove Instance.syserr/trace

[nikiroo-utils.git] / src / be / nikiroo / fanfix / library / RemoteLibrary.java

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index acbd495d079b88047bfbc0e0e1769894b7375a1e..f4e8264eca29a536c77f26646bc2cab243a4cccf 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -11,7 +11,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionClient;
+import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 
 /**
  * This {@link BasicLibrary} will access a remote server to list the available
@@ -23,16 +23,21 @@ import be.nikiroo.utils.serial.ConnectActionClient;
 public class RemoteLibrary extends BasicLibrary {
        private String host;
        private int port;
+       private final String key;
 
        /**
         * Create a {@link RemoteLibrary} linked to the given server.
         * 
+        * @param key
+        *            the key that will allow us to exchange information with the
+        *            server
         * @param host
         *            the host to contact or NULL for localhost
         * @param port
         *            the port to contact it on
         */
-       public RemoteLibrary(String host, int port) {
+       public RemoteLibrary(String key, String host, int port) {
+               this.key = key;
                this.host = host;
                this.port = port;
        }
@@ -46,8 +51,8 @@ public class RemoteLibrary extends BasicLibrary {
        protected List<MetaData> getMetas(Progress pg) {
                // TODO: progress
                final List<MetaData> metas = new ArrayList<MetaData>();
-               MetaData[] fromNetwork = this
-                               .<MetaData[]> getRemoteObject("GET_METADATA *");
+               MetaData[] fromNetwork = this.<MetaData[]> getRemoteObject( //
+                               new Object[] { key, "GET_METADATA", "*" });
 
                if (fromNetwork != null) {
                        for (MetaData meta : fromNetwork) {
@@ -60,12 +65,20 @@ public class RemoteLibrary extends BasicLibrary {
 
        @Override
        public BufferedImage getCover(final String luid) {
-               return this.<BufferedImage> getRemoteObject("GET_COVER " + luid);
+               return this.<BufferedImage> getRemoteObject( //
+                               new Object[] { key, "GET_COVER", luid });
+       }
+
+       @Override
+       public BufferedImage getSourceCover(final String source) {
+               return this.<BufferedImage> getRemoteObject( //
+                               new Object[] { key, "GET_SOURCE_COVER", source });
        }
 
        @Override
        public synchronized Story getStory(final String luid, Progress pg) {
-               return this.<Story> getRemoteObject("GET_STORY " + luid);
+               return this.<Story> getRemoteObject( //
+                               new Object[] { key, "GET_STORY", luid });
        }
 
        @Override
@@ -75,20 +88,24 @@ public class RemoteLibrary extends BasicLibrary {
        @Override
        public synchronized Story save(Story story, String luid, Progress pg)
                        throws IOException {
-               throw new java.lang.InternalError(
-                               "No write support allowed on remote Libraries");
+               getRemoteObject(new Object[] { key, "SAVE_STORY", story, luid });
+
+               // because the meta changed:
+               clearCache();
+               story.setMeta(getInfo(luid));
+
+               return story;
        }
 
        @Override
        public synchronized void delete(String luid) throws IOException {
-               throw new java.lang.InternalError(
-                               "No write support allowed on remote Libraries");
+               getRemoteObject(new Object[] { key, "DELETE_STORY", luid });
        }
 
        @Override
        public void setSourceCover(String source, String luid) {
-               throw new java.lang.InternalError(
-                               "No write support allowed on remote Libraries");
+               this.<BufferedImage> getRemoteObject( //
+               new Object[] { key, "SET_SOURCE_COVER", source, luid });
        }
 
        @Override
@@ -125,28 +142,28 @@ public class RemoteLibrary extends BasicLibrary {
         * @return the object or NULL
         */
        @SuppressWarnings("unchecked")
-       private <T> T getRemoteObject(final String command) {
+       private <T> T getRemoteObject(final Object[] command) {
                final Object[] result = new Object[1];
                try {
-                       new ConnectActionClient(host, port, true) {
+                       new ConnectActionClientObject(host, port, true) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
                                        try {
                                                Object rep = send(command);
                                                result[0] = rep;
                                        } catch (Exception e) {
-                                               Instance.syserr(e);
+                                               Instance.getTraceHandler().error(e);
                                        }
                                }
                        }.connect();
                } catch (IOException e) {
-                       Instance.syserr(e);
+                       Instance.getTraceHandler().error(e);
                }
 
                try {
                        return (T) result[0];
                } catch (Exception e) {
-                       Instance.syserr(e);
+                       Instance.getTraceHandler().error(e);
                        return null;
                }
        }