change config names

[fanfix.git] / src / be / nikiroo / fanfix / supported / InfoReader.java

diff --git a/src/be/nikiroo/fanfix/supported/InfoReader.java b/src/be/nikiroo/fanfix/supported/InfoReader.java
index 369b32454ac95c2433122c9d9dcd422bcfb7157f..3d09a55a14d024df221cd0b6db56a959b7416407 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/InfoReader.java
+++ b/src/be/nikiroo/fanfix/supported/InfoReader.java
@@ -14,7 +14,7 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 // not complete: no "description" tag
 public class InfoReader {
@@ -25,8 +25,7 @@ public class InfoReader {
                }
 
                if (infoFile.exists()) {
-                       InputStream in = new MarkableFileInputStream(new FileInputStream(
-                                       infoFile));
+                       InputStream in = new MarkableFileInputStream(infoFile);
                        try {
                                return createMeta(infoFile.toURI().toURL(), in, withCover);
                        } finally {
@@ -96,7 +95,7 @@ public class InfoReader {
                File basefile = new File(sourceInfoFile.getFile());
 
                String ext = "."
-                               + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER)
+                               + Instance.getConfig().getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER)
                                                .toLowerCase();
 
                // Without removing ext
@@ -108,9 +107,8 @@ public class InfoReader {
                int pos = name.lastIndexOf(".");
                if (cover == null && pos > 0) {
                        name = name.substring(0, pos);
-                       basefile = new File(basefile.getParent(), basefile.getName());
+                       basefile = new File(basefile.getParent(), name);
 
-System.out.println(">>> " + basefile);
                        cover = BasicSupportHelper.getImage(null, sourceInfoFile,
                                        basefile.getAbsolutePath() + ext);
                }