Update nikiroo-utils, bugfixes:

[nikiroo-utils.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 ab5a82b58b48a51ed4b1abc085118e986184f4fd..4c4542551410d06cbe9d9e074961214d64c48129 100644 (file)
--- a/src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java
@@ -40,15 +40,48 @@ public class LocalLibrary extends BasicLibrary {
        private OutputType text;
        private OutputType image;
 
+       /**
+        * Create a new {@link LocalLibrary} with the given back-end directory.
+        * 
+        * @param baseDir
+        *            the directory where to find the {@link Story} objects
+        */
+       public LocalLibrary(File baseDir) {
+               this(baseDir, Instance.getConfig().getString(
+                               Config.NON_IMAGES_DOCUMENT_TYPE), Instance.getConfig()
+                               .getString(Config.IMAGES_DOCUMENT_TYPE), false);
+       }
+
+       /**
+        * Create a new {@link LocalLibrary} with the given back-end directory.
+        * 
+        * @param baseDir
+        *            the directory where to find the {@link Story} objects
+        * @param text
+        *            the {@link OutputType} to use for non-image documents
+        * @param image
+        *            the {@link OutputType} to use for image documents
+        * @param defaultIsHtml
+        *            if the given text or image is invalid, use HTML by default (if
+        *            not, it will be INFO_TEXT/CBZ by default)
+        */
+       public LocalLibrary(File baseDir, String text, String image,
+                       boolean defaultIsHtml) {
+               this(baseDir, OutputType.valueOfAllOkUC(text,
+                               defaultIsHtml ? OutputType.HTML : OutputType.INFO_TEXT),
+                               OutputType.valueOfAllOkUC(image,
+                                               defaultIsHtml ? OutputType.HTML : OutputType.CBZ));
+       }
+
        /**
         * Create a new {@link LocalLibrary} with the given back-end directory.
         * 
         * @param baseDir
         *            the directory where to find the {@link Story} objects
         * @param text
-        *            the {@link OutputType} to save the text-focused stories into
+        *            the {@link OutputType} to use for non-image documents
         * @param image
-        *            the {@link OutputType} to save the images-focused stories into
+        *            the {@link OutputType} to use for image documents
         */
        public LocalLibrary(File baseDir, OutputType text, OutputType image) {
                this.baseDir = baseDir;
@@ -68,8 +101,8 @@ public class LocalLibrary extends BasicLibrary {
        }
 
        @Override
-       public File getFile(String luid) {
-               File[] files = getStories(null).get(getInfo(luid));
+       public File getFile(String luid, Progress pg) {
+               File[] files = getStories(pg).get(getInfo(luid));
                if (files != null) {
                        return files[1];
                }
@@ -89,7 +122,7 @@ public class LocalLibrary extends BasicLibrary {
                                        meta = InfoReader.readMeta(infoFile, true);
                                        return meta.getCover();
                                } catch (IOException e) {
-                                       Instance.syserr(e);
+                                       Instance.getTraceHandler().error(e);
                                }
                        }
                }
@@ -150,7 +183,7 @@ public class LocalLibrary extends BasicLibrary {
                                        InfoCover.writeInfo(newDir, name, meta);
                                        relatedFile.delete();
                                } catch (IOException e) {
-                                       Instance.syserr(e);
+                                       Instance.getTraceHandler().error(e);
                                }
                        } else {
                                relatedFile.renameTo(new File(newDir, relatedFile.getName()));
@@ -176,7 +209,7 @@ public class LocalLibrary extends BasicLibrary {
                try {
                        ImageIO.write(sourceCovers.get(source), "png", cover);
                } catch (IOException e) {
-                       Instance.syserr(e);
+                       Instance.getTraceHandler().error(e);
                        sourceCovers.remove(source);
                }
        }
@@ -190,13 +223,15 @@ public class LocalLibrary extends BasicLibrary {
 
                // 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());
+                       LocalLibrary otherLocalLibrary = (LocalLibrary) other;
+
+                       MetaData meta = otherLocalLibrary.getInfo(luid);
+                       String expectedType = ""
+                                       + (meta != null && meta.isImageDocument() ? image : text);
+                       if (meta != null && meta.getType().equals(expectedType)) {
+                               File from = otherLocalLibrary.getExpectedDir(meta.getSource());
                                File to = this.getExpectedDir(meta.getSource());
-                               List<File> sources = otherLibrary.getRelatedFiles(luid);
+                               List<File> sources = otherLocalLibrary.getRelatedFiles(luid);
                                if (!sources.isEmpty()) {
                                        pg.setMinMax(0, sources.size());
                                }
@@ -205,6 +240,7 @@ public class LocalLibrary extends BasicLibrary {
                                        File target = new File(source.getAbsolutePath().replace(
                                                        from.getAbsolutePath(), to.getAbsolutePath()));
                                        if (!source.equals(target)) {
+                                               target.getParentFile().mkdirs();
                                                InputStream in = null;
                                                try {
                                                        in = new FileInputStream(source);
@@ -232,6 +268,8 @@ public class LocalLibrary extends BasicLibrary {
                }
 
                super.imprt(other, luid, pg);
+
+               clearCache();
        }
 
        /**
@@ -293,14 +331,14 @@ public class LocalLibrary extends BasicLibrary {
         * The directory (full path) where the new {@link Story} related to this
         * {@link MetaData} should be located on disk.
         * 
-        * @param type
+        * @param source
         *            the type (source)
         * 
         * @return the target directory
         */
-       private File getExpectedDir(String type) {
-               String source = type.replaceAll("[^a-zA-Z0-9._+-]", "_");
-               return new File(baseDir, source);
+       private File getExpectedDir(String source) {
+               String sanitizedSource = source.replaceAll("[^a-zA-Z0-9._+-]", "_");
+               return new File(baseDir, sanitizedSource);
        }
 
        /**
@@ -345,7 +383,8 @@ public class LocalLibrary extends BasicLibrary {
                }
 
                String coverExt = "."
-                               + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER);
+                               + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER)
+                                               .toLowerCase();
                File coverFile = new File(path + coverExt);
                if (!coverFile.exists()) {
                        coverFile = new File(path.substring(0,
@@ -434,8 +473,10 @@ public class LocalLibrary extends BasicLibrary {
                                        } catch (IOException e) {
                                                // We should not have not-supported files in the
                                                // library
-                                               Instance.syserr(new IOException(
-                                                               "Cannot load file from library: " + infoFile, e));
+                                               Instance.getTraceHandler().error(
+                                                               new IOException(
+                                                                               "Cannot load file from library: "
+                                                                                               + infoFile, e));
                                        }
                                        pgFiles.add(1);
                                }
@@ -451,7 +492,7 @@ public class LocalLibrary extends BasicLibrary {
                                                        in.close();
                                                }
                                        } catch (IOException e) {
-                                               Instance.syserr(e);
+                                               Instance.getTraceHandler().error(e);
                                        }
                                }
 
@@ -463,4 +504,23 @@ public class LocalLibrary extends BasicLibrary {
 
                return stories;
        }
+
+       /**
+        * Fix the source cover to the given story cover.
+        * 
+        * @param source
+        *            the source to change
+        * @param coverImage
+        *            the cover image
+        */
+       void setSourceCover(String source, BufferedImage coverImage) {
+               sourceCovers.put(source, coverImage);
+               File cover = new File(getExpectedDir(source), ".cover.png");
+               try {
+                       ImageIO.write(sourceCovers.get(source), "png", cover);
+               } catch (IOException e) {
+                       Instance.getTraceHandler().error(e);
+                       sourceCovers.remove(source);
+               }
+       }
 }