Lot of fixes + first (bad, ugly) working GUI

[fanfix.git] / src / be / nikiroo / fanfix / reader / BasicReader.java

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index eeb00af1c6ff2f5439af6c4bdfbe9bd8669142e4..eabbe7e4408ddf758c623fd65c835e1a3643a95a 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -5,14 +5,14 @@ import java.net.URL;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.Library;
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.supported.BasicSupport;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 
 /**
- * Command line {@link Story} reader.
+ * The class that handles the different {@link Story} readers you can use.
  * <p>
- * Will output stories to the console.
+ * All the readers should be accessed via {@link BasicReader#getReader()}.
  * 
  * @author niki
  */
@@ -24,12 +24,23 @@ public abstract class BasicReader {
                LOCAL
        }
 
-       private static ReaderType defaultType;
+       private static ReaderType defaultType = ReaderType.CLI;
        private Story story;
        private ReaderType type;
 
+       /**
+        * Take the default reader type configuration from the config file.
+        */
        static {
-               // TODO: default type from config
+               String typeString = Instance.getConfig().getString(Config.READER_TYPE);
+               if (typeString != null && !typeString.isEmpty()) {
+                       try {
+                               ReaderType type = ReaderType.valueOf(typeString.toUpperCase());
+                               defaultType = type;
+                       } catch (IllegalArgumentException e) {
+                               // Do nothing
+                       }
+               }
        }
 
        /**
@@ -73,7 +84,17 @@ public abstract class BasicReader {
        public void setStory(String luid) throws IOException {
                story = Instance.getLibrary().getStory(luid);
                if (story == null) {
-                       throw new IOException("Cannot retrieve story from library: " + luid);
+                       // if the LUID is wrong and < 3, pad it to 3 chars with "0" then
+                       // retry (since LUIDs are %03d)
+                       if (luid != null && luid.length() < 3) {
+                               while (luid.length() < 3) {
+                                       luid = "0" + luid;
+                               }
+                               setStory(luid);
+                       } else {
+                               throw new IOException("Cannot retrieve story from library: "
+                                               + luid);
+                       }
                }
        }
 
@@ -125,19 +146,28 @@ public abstract class BasicReader {
         *            the type of {@link Story} to take into account, or NULL for
         *            all
         */
-       public abstract void start(SupportType type);
+       public abstract void start(String type);
 
        /**
-        * Return a new {@link BasicReader} ready for use.
+        * Return a new {@link BasicReader} ready for use if one is configured.
+        * <p>
+        * Can return NULL if none are configured.
         * 
-        * @return a {@link BasicReader}
+        * @return a {@link BasicReader}, or NULL if none configured
         */
        public static BasicReader getReader() {
-               switch (defaultType) {
-               // case LOCAL:
-               // return new LocalReader().setType(ReaderType.LOCAL);
-               case CLI:
-                       return new CliReader().setType(ReaderType.CLI);
+               try {
+                       if (defaultType != null) {
+                               switch (defaultType) {
+                               case LOCAL:
+                                       return new LocalReader().setType(ReaderType.LOCAL);
+                               case CLI:
+                                       return new CliReader().setType(ReaderType.CLI);
+                               }
+                       }
+               } catch (IOException e) {
+                       Instance.syserr(new Exception("Cannot create a reader of type: "
+                                       + defaultType, e));
                }
 
                return null;