fix remote default covers

[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 bdded01810ebedc0452867175da9eb1b3899ffdb..eafd18a6ecf642317c9e35c1e8e1c25aeea0ec5b 100644 (file)
--- a/src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java
@@ -3,6 +3,7 @@ package be.nikiroo.fanfix.library;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -105,8 +106,6 @@ public class LocalLibrary extends BasicLibrary {
                String mess = "no file found for ";
 
                MetaData meta = getInfo(luid);
-               Instance.getTraceHandler().trace("(info is: " + meta + ")");
-
                File[] files = getStories(pg).get(meta);
                if (files != null) {
                        mess = "file retrieved for ";
@@ -114,7 +113,8 @@ public class LocalLibrary extends BasicLibrary {
                }
 
                Instance.getTraceHandler().trace(
-                               this.getClass().getSimpleName() + ": " + mess + luid);
+                               this.getClass().getSimpleName() + ": " + mess + luid + " ("
+                                               + meta.getTitle() + ")");
 
                return file;
        }
@@ -123,6 +123,10 @@ public class LocalLibrary extends BasicLibrary {
        public Image getCover(String luid) {
                MetaData meta = getInfo(luid);
                if (meta != null) {
+                       if (meta.getCover() != null) {
+                               return meta.getCover();
+                       }
+
                        File[] files = getStories(null).get(meta);
                        if (files != null) {
                                File infoFile = files[0];
@@ -211,13 +215,37 @@ public class LocalLibrary extends BasicLibrary {
        }
 
        @Override
-       public Image getSourceCover(String source) {
+       public synchronized Image getCustomSourceCover(String source) {
                if (sourceCovers == null) {
-                       getStories(null);
+                       sourceCovers = new HashMap<String, Image>();
+               }
+
+               Image img = sourceCovers.get(source);
+               if (img != null) {
+                       return img;
                }
 
-               if (!sourceCovers.containsKey(source)) {
-                       sourceCovers.put(source, super.getSourceCover(source));
+               File coverDir = new File(baseDir, source);
+               if (coverDir.isDirectory()) {
+                       File cover = new File(coverDir, ".cover.png");
+                       if (cover.exists()) {
+                               InputStream in;
+                               try {
+                                       in = new FileInputStream(cover);
+                                       try {
+                                               sourceCovers.put(source, new Image(in));
+                                       } finally {
+                                               in.close();
+                                       }
+                               } catch (FileNotFoundException e) {
+                                       e.printStackTrace();
+                               } catch (IOException e) {
+                                       Instance.getTraceHandler().error(
+                                                       new IOException(
+                                                                       "Cannot load the existing custom source cover: "
+                                                                                       + cover, e));
+                               }
+                       }
                }
 
                return sourceCovers.get(source);
@@ -225,18 +253,28 @@ public class LocalLibrary extends BasicLibrary {
 
        @Override
        public void setSourceCover(String source, String luid) {
-               if (sourceCovers == null) {
-                       getStories(null);
-               }
+               setSourceCover(source, getCover(luid));
+       }
 
-               sourceCovers.put(source, getCover(luid));
-               File cover = new File(getExpectedDir(source), ".cover");
+       /**
+        * Fix the source cover to the given story cover.
+        * 
+        * @param source
+        *            the source to change
+        * @param coverImage
+        *            the cover image
+        */
+       synchronized void setSourceCover(String source, Image coverImage) {
+               File dir = getExpectedDir(source);
+               dir.mkdirs();
+               File cover = new File(dir, ".cover");
                try {
-                       Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
-                                       true);
+                       Instance.getCache().saveAsImage(coverImage, cover, true);
+                       if (sourceCovers != null) {
+                               sourceCovers.put(source, coverImage);
+                       }
                } catch (IOException e) {
                        Instance.getTraceHandler().error(e);
-                       sourceCovers.remove(source);
                }
        }
 
@@ -433,8 +471,8 @@ public class LocalLibrary extends BasicLibrary {
         * @param pg
         *            the optional {@link Progress}
         * 
-        * @return the list of stories (for each item, the first {@link File} is the info file, the
-        *         second file is the target {@link File})
+        * @return the list of stories (for each item, the first {@link File} is the
+        *         info file, the second file is the target {@link File})
         */
        private synchronized Map<MetaData, File[]> getStories(Progress pg) {
                if (pg == null) {
@@ -445,7 +483,6 @@ public class LocalLibrary extends BasicLibrary {
 
                if (stories == null) {
                        stories = new HashMap<MetaData, File[]>();
-                       sourceCovers = new HashMap<String, Image>();
 
                        lastId = 0;
 
@@ -474,13 +511,11 @@ 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) {
@@ -507,20 +542,6 @@ public class LocalLibrary extends BasicLibrary {
                                                pgFiles.add(1);
                                        }
 
-                                       File cover = new File(dir, ".cover.png");
-                                       if (cover.exists()) {
-                                               try {
-                                                       InputStream in = new FileInputStream(cover);
-                                                       try {
-                                                               sourceCovers.put(source, new Image(in));
-                                                       } finally {
-                                                               in.close();
-                                                       }
-                                               } catch (IOException e) {
-                                                       Instance.getTraceHandler().error(e);
-                                               }
-                                       }
-
                                        pgFiles.setName(null);
                                }
 
@@ -531,28 +552,4 @@ public class LocalLibrary extends BasicLibrary {
                pg.done();
                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, Image coverImage) {
-               if (sourceCovers == null) {
-                       getStories(null);
-               }
-
-               sourceCovers.put(source, coverImage);
-               File cover = new File(getExpectedDir(source), ".cover");
-               try {
-                       Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
-                                       true);
-               } catch (IOException e) {
-                       Instance.getTraceHandler().error(e);
-                       sourceCovers.remove(source);
-               }
-       }
 }