Improve CacheLibrary Save()

[fanfix.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..f665e383cad2f43f6c0b1807d56e5fdb69705b13 100644 (file)
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -80,7 +80,7 @@ public class CacheLibrary extends BasicLibrary {
                                pgImport.done();
                                clearCache();
                        } catch (IOException e) {
-                               Instance.syserr(e);
+                               Instance.getTraceHandler().error(e);
                        }
 
                        pgImport.done();
@@ -126,8 +126,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, luid, pgCacheLib);
+
                clearCache();
+
                return story;
        }
 
@@ -153,7 +167,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 +200,10 @@ 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();
+               }
        }
 
        // All the following methods are only used by Save and Delete in