Update nikiroo-utils, Remote:

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

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 38fb7b3193e1b13da59e2abc285d2a6bd0461dfa..14113e4a583be24b5ea2a5ba71b04810220255c6 100644 (file)
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -3,6 +3,7 @@ package be.nikiroo.fanfix.library;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 
 import be.nikiroo.fanfix.Instance;
@@ -45,6 +46,11 @@ public class CacheLibrary extends BasicLibrary {
                return lib.getLibraryName();
        }
 
+       @Override
+       public Status getStatus() {
+               return lib.getStatus();
+       }
+
        @Override
        protected List<MetaData> getMetas(Progress pg) {
                if (pg == null) {
@@ -80,7 +86,7 @@ public class CacheLibrary extends BasicLibrary {
                                pgImport.done();
                                clearCache();
                        } catch (IOException e) {
-                               Instance.syserr(e);
+                               Instance.getTraceHandler().error(e);
                        }
 
                        pgImport.done();
@@ -96,6 +102,7 @@ public class CacheLibrary extends BasicLibrary {
 
        @Override
        public BufferedImage getCover(final String luid) {
+               // TODO: cache doesn't seem to work
                if (isCached(luid)) {
                        return cacheLib.getCover(luid);
                }
@@ -126,8 +133,22 @@ public class CacheLibrary extends BasicLibrary {
        @Override
        public synchronized Story save(Story story, String luid, Progress pg)
                        throws IOException {
-               story = lib.save(story, luid, pg);
+               Progress pgLib = new Progress();
+               Progress pgCacheLib = new Progress();
+
+               if (pg == null) {
+                       pg = new Progress();
+               }
+
+               pg.setMinMax(0, 2);
+               pg.addProgress(pgLib, 1);
+               pg.addProgress(pgCacheLib, 1);
+
+               story = lib.save(story, luid, pgLib);
+               story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
+
                clearCache();
+
                return story;
        }
 
@@ -153,7 +174,9 @@ public class CacheLibrary extends BasicLibrary {
                pg.addProgress(pgCache, 1);
                pg.addProgress(pgOrig, 1);
 
-               cacheLib.changeSource(luid, newSource, pgCache);
+               if (isCached(luid)) {
+                       cacheLib.changeSource(luid, newSource, pgCache);
+               }
                pgCache.done();
                lib.changeSource(luid, newSource, pgOrig);
                pgOrig.done();
@@ -184,8 +207,29 @@ public class CacheLibrary extends BasicLibrary {
         *             in case of I/O error
         */
        public void clearFromCache(String luid) throws IOException {
-               cacheLib.delete(luid);
-               clearCache();
+               if (isCached(luid)) {
+                       cacheLib.delete(luid);
+                       clearCache();
+               }
+       }
+
+       @Override
+       public Story imprt(URL url, Progress pg) throws IOException {
+               if (pg == null) {
+                       pg = new Progress();
+               }
+
+               Progress pgImprt = new Progress();
+               Progress pgCache = new Progress();
+               pg.setMinMax(0, 10);
+               pg.addProgress(pgImprt, 7);
+               pg.addProgress(pgCache, 3);
+
+               Story story = lib.imprt(url, pgImprt);
+               cacheLib.save(story, story.getMeta().getLuid(), pgCache);
+
+               pg.done();
+               return story;
        }
 
        // All the following methods are only used by Save and Delete in