fix remote tries to import remote files

[fanfix.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 5052fa279dd4cdcbe127a61edd8f2a00ca4bf9a6..75f98be8bd62b18c9ab66801eb372ba6a0003389 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -119,15 +119,15 @@ public class RemoteLibrary extends BasicLibrary {
        }
 
        @Override
-       public Image getSourceCover(final String source) {
+       public Image getCustomSourceCover(final String source) {
                final Image[] result = new Image[1];
 
                try {
                        new ConnectActionClientObject(host, port, true) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
-                                       Object rep = send(new Object[] { md5, "GET_SOURCE_COVER",
-                                                       source });
+                                       Object rep = send(new Object[] { md5,
+                                                       "GET_CUSTOM_SOURCE_COVER", source });
                                        result[0] = (Image) rep;
                                }
 
@@ -233,10 +233,14 @@ public class RemoteLibrary extends BasicLibrary {
                }.connect();
 
                // because the meta changed:
-               invalidateInfo(luidSaved[0]);
-
                MetaData meta = getInfo(luidSaved[0]);
-               meta.setCover(story.getMeta().getCover());
+               if (story.getMeta().getClass() != null) {
+                       // If already available locally:
+                       meta.setCover(story.getMeta().getCover());
+               } else {
+                       // If required:
+                       meta.setCover(getCover(meta.getLuid()));
+               }
                story.setMeta(meta);
 
                pg.done();
@@ -281,6 +285,13 @@ public class RemoteLibrary extends BasicLibrary {
        @Override
        // Could work (more slowly) without it
        public Story imprt(final URL url, Progress pg) throws IOException {
+               // Import the file locally if it is actually a file
+               if (url == null || url.getProtocol().equalsIgnoreCase("file")) {
+                       return super.imprt(url, pg);
+               }
+
+               // Import it remotely if it is an URL
+
                if (pg == null) {
                        pg = new Progress();
                }
@@ -411,7 +422,13 @@ public class RemoteLibrary extends BasicLibrary {
        }
 
        @Override
-       protected void invalidateInfo(String luid) {
+       protected void updateInfo(MetaData meta) {
+               // Will be taken care of directly server side
+       }
+
+       @Override
+       protected void deleteInfo(String luid) {
+               // Will be taken care of directly server side
        }
 
        // The following methods are only used by Save and Delete in BasicLibrary:
@@ -436,6 +453,8 @@ public class RemoteLibrary extends BasicLibrary {
        /**
         * Return the meta of the given story or a list of all known metas if the
         * luid is "*".
+        * <p>
+        * Will not get the covers.
         * 
         * @param luid
         *            the luid of the story or *