Some fixes: output types, libraries, remote

[fanfix.git] / src / be / nikiroo / fanfix / Instance.java

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 4cf6e86113e46c620ae50ed87022ddc49e4f0eeb..df990d7f3b1431aabc81c3a3d6ceabaa91a21a94 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -6,12 +6,12 @@ import java.util.Date;
 
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.ConfigBundle;
+import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.bundles.StringIdBundle;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.bundles.UiConfigBundle;
 import be.nikiroo.fanfix.library.BasicLibrary;
 import be.nikiroo.fanfix.library.LocalLibrary;
-import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.resources.Bundles;
 
@@ -59,7 +59,7 @@ public class Instance {
        private static ConfigBundle config;
        private static UiConfigBundle uiconfig;
        private static StringIdBundle trans;
-       private static Cache cache;
+       private static DataLoader cache;
        private static LocalLibrary lib;
        private static boolean debug;
        private static boolean trace;
@@ -104,11 +104,16 @@ public class Instance {
                } catch (IOException e) {
                        syserr(e);
                }
-               try {
-                       trans = new StringIdBundle(getLang());
-                       trans.updateFile(configDir);
-               } catch (IOException e) {
-                       syserr(e);
+
+               // No updateFile for this one! (we do not want the user to have custom
+               // translations that won't accept updates from newer versions)
+               trans = new StringIdBundle(getLang());
+
+               // Fix an old bug (we used to store custom translation files by
+               // default):
+               if (trans.getString(StringId.INPUT_DESC_CBZ) == null) {
+                       // TODO: create the deleteFile method
+                       // trans.deleteFile(configDir);
                }
 
                Bundles.setDirectory(configDir);
@@ -116,8 +121,7 @@ public class Instance {
                uiconfig = new UiConfigBundle();
                trans = new StringIdBundle(getLang());
                try {
-                       lib = new LocalLibrary(getFile(Config.LIBRARY_DIR),
-                                       OutputType.INFO_TEXT, OutputType.CBZ);
+                       lib = new LocalLibrary(getFile(Config.LIBRARY_DIR));
                } catch (Exception e) {
                        syserr(new IOException("Cannot create library for directory: "
                                        + getFile(Config.LIBRARY_DIR), e));
@@ -128,7 +132,7 @@ public class Instance {
                coverDir = getFile(Config.DEFAULT_COVERS_DIR);
                File tmp = getFile(Config.CACHE_DIR);
                readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER);
-               remoteDir = new File(getFile(Config.LIBRARY_DIR), "remote");
+               remoteDir = new File(configDir, "remote");
 
                if (checkEnv("NOUTF")) {
                        trans.setUnicode(false);
@@ -160,7 +164,7 @@ public class Instance {
                        int hoursLarge = config
                                        .getInteger(Config.CACHE_MAX_TIME_STABLE, -1);
 
-                       cache = new Cache(tmp, ua, hours, hoursLarge);
+                       cache = new DataLoader(tmp, ua, hours, hoursLarge);
                } catch (IOException e) {
                        syserr(new IOException(
                                        "Cannot create cache (will continue without cache)", e));
@@ -186,11 +190,11 @@ public class Instance {
        }
 
        /**
-        * Get the (unique) {@link Cache} for the program.
+        * Get the (unique) {@link DataLoader} for the program.
         * 
-        * @return the {@link Cache}
+        * @return the {@link DataLoader}
         */
-       public static Cache getCache() {
+       public static DataLoader getCache() {
                return cache;
        }