Update nikiroo-utils (Progress) + GuiReader perf

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

diff --git a/src/be/nikiroo/fanfix/library/LocalLibrary.java b/src/be/nikiroo/fanfix/library/LocalLibrary.java
index d7fd5212ed8bddaec5afca42179f37c9b4d80ee6..ab5a82b58b48a51ed4b1abc085118e986184f4fd 100644 (file)
--- a/src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java
@@ -3,12 +3,16 @@ package be.nikiroo.fanfix.library;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.imageio.ImageIO;
+
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
@@ -18,6 +22,8 @@ import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.output.InfoCover;
 import be.nikiroo.fanfix.supported.InfoReader;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.ImageUtils;
+import be.nikiroo.utils.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -28,6 +34,7 @@ import be.nikiroo.utils.Progress;
 public class LocalLibrary extends BasicLibrary {
        private int lastId;
        private Map<MetaData, File[]> stories; // Files: [ infoFile, TargetFile ]
+       private Map<String, BufferedImage> sourceCovers;
 
        private File baseDir;
        private OutputType text;
@@ -50,6 +57,7 @@ public class LocalLibrary extends BasicLibrary {
 
                this.lastId = 0;
                this.stories = null;
+               this.sourceCovers = new HashMap<String, BufferedImage>();
 
                baseDir.mkdirs();
        }
@@ -92,10 +100,12 @@ public class LocalLibrary extends BasicLibrary {
        @Override
        protected void clearCache() {
                stories = null;
+               sourceCovers = new HashMap<String, BufferedImage>();
        }
 
        @Override
        protected synchronized int getNextId() {
+               getStories(null); // make sure lastId is set
                return ++lastId;
        }
 
@@ -150,6 +160,80 @@ public class LocalLibrary extends BasicLibrary {
                clearCache();
        }
 
+       @Override
+       public BufferedImage getSourceCover(String source) {
+               if (!sourceCovers.containsKey(source)) {
+                       sourceCovers.put(source, super.getSourceCover(source));
+               }
+
+               return sourceCovers.get(source);
+       }
+
+       @Override
+       public void setSourceCover(String source, String luid) {
+               sourceCovers.put(source, getCover(luid));
+               File cover = new File(getExpectedDir(source), ".cover.png");
+               try {
+                       ImageIO.write(sourceCovers.get(source), "png", cover);
+               } catch (IOException e) {
+                       Instance.syserr(e);
+                       sourceCovers.remove(source);
+               }
+       }
+
+       @Override
+       public void imprt(BasicLibrary other, String luid, Progress pg)
+                       throws IOException {
+               if (pg == null) {
+                       pg = new Progress();
+               }
+
+               // Check if we can simply copy the files instead of the whole process
+               if (other instanceof LocalLibrary) {
+                       LocalLibrary otherLibrary = (LocalLibrary) other;
+                       MetaData meta = otherLibrary.getInfo(luid);
+                       String expectedType = "" + (meta.isImageDocument() ? image : text);
+                       if (meta.getType().equals(expectedType)) {
+                               File from = otherLibrary.getExpectedDir(meta.getSource());
+                               File to = this.getExpectedDir(meta.getSource());
+                               List<File> sources = otherLibrary.getRelatedFiles(luid);
+                               if (!sources.isEmpty()) {
+                                       pg.setMinMax(0, sources.size());
+                               }
+
+                               for (File source : sources) {
+                                       File target = new File(source.getAbsolutePath().replace(
+                                                       from.getAbsolutePath(), to.getAbsolutePath()));
+                                       if (!source.equals(target)) {
+                                               InputStream in = null;
+                                               try {
+                                                       in = new FileInputStream(source);
+                                                       IOUtils.write(in, target);
+                                               } catch (IOException e) {
+                                                       if (in != null) {
+                                                               try {
+                                                                       in.close();
+                                                               } catch (Exception ee) {
+                                                               }
+                                                       }
+
+                                                       pg.done();
+                                                       throw e;
+                                               }
+                                       }
+
+                                       pg.add(1);
+                               }
+
+                               clearCache();
+                               pg.done();
+                               return;
+                       }
+               }
+
+               super.imprt(other, luid, pg);
+       }
+
        /**
         * Return the {@link OutputType} for this {@link Story}.
         * 
@@ -324,10 +408,12 @@ public class LocalLibrary extends BasicLibrary {
                                pgDirs.addProgress(pgFiles, 100);
                                pgDirs.setName("Loading from: " + dir.getName());
 
+                               String source = null;
                                for (File infoFile : infoFiles) {
                                        pgFiles.setName(infoFile.getName());
                                        try {
                                                MetaData meta = InfoReader.readMeta(infoFile, false);
+                                               source = meta.getSource();
                                                try {
                                                        int id = Integer.parseInt(meta.getLuid());
                                                        if (id > lastId) {
@@ -354,6 +440,21 @@ public class LocalLibrary extends BasicLibrary {
                                        pgFiles.add(1);
                                }
 
+                               File cover = new File(dir, ".cover.png");
+                               if (cover.exists()) {
+                                       try {
+                                               InputStream in = new MarkableFileInputStream(
+                                                               new FileInputStream(cover));
+                                               try {
+                                                       sourceCovers.put(source, ImageUtils.fromStream(in));
+                                               } finally {
+                                                       in.close();
+                                               }
+                                       } catch (IOException e) {
+                                               Instance.syserr(e);
+                                       }
+                               }
+
                                pgFiles.setName(null);
                        }