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 f9350efc4b353abc92bb9849ec8aac21368493a5..4c4542551410d06cbe9d9e074961214d64c48129 100644 (file)
--- a/src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java
@@ -122,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);
                                }
                        }
                }
@@ -183,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()));
@@ -209,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);
                }
        }
@@ -331,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);
        }
 
        /**
@@ -383,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,
@@ -472,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);
                                }
@@ -489,7 +492,7 @@ public class LocalLibrary extends BasicLibrary {
                                                        in.close();
                                                }
                                        } catch (IOException e) {
-                                               Instance.syserr(e);
+                                               Instance.getTraceHandler().error(e);
                                        }
                                }
 
@@ -501,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);
+               }
+       }
 }