Version 1.1.0

[nikiroo-utils.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 34133e40c232008075e16f3fb653317eea03c424..bc3bf72f2ab7f3c576daddac33b39d4a2bfa8052 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -8,12 +8,12 @@ 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;
+import be.nikiroo.utils.ui.Progress;
 
 /**
- * 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
  */
@@ -79,23 +79,16 @@ public abstract class BasicReader {
         * 
         * @param luid
         *            the {@link Story} ID
+        * @param pg
+        *            the optional progress reporter
+        * 
         * @throws IOException
         *             in case of I/O error
         */
-       public void setStory(String luid) throws IOException {
-               story = Instance.getLibrary().getStory(luid);
+       public void setStory(String luid, Progress pg) throws IOException {
+               story = Instance.getLibrary().getStory(luid, pg);
                if (story == null) {
-                       // 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);
-                       }
+                       throw new IOException("Cannot retrieve story from library: " + luid);
                }
        }
 
@@ -104,16 +97,19 @@ public abstract class BasicReader {
         * 
         * @param source
         *            the {@link Story} {@link URL}
+        * @param pg
+        *            the optional progress reporter
+        * 
         * @throws IOException
         *             in case of I/O error
         */
-       public void setStory(URL source) throws IOException {
+       public void setStory(URL source, Progress pg) throws IOException {
                BasicSupport support = BasicSupport.getSupport(source);
                if (support == null) {
                        throw new IOException("URL not supported: " + source.toString());
                }
 
-               story = support.process(source);
+               story = support.process(source, pg);
                if (story == null) {
                        throw new IOException(
                                        "Cannot retrieve story from external source: "
@@ -147,7 +143,7 @@ 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 if one is configured.
@@ -157,13 +153,18 @@ public abstract class BasicReader {
         * @return a {@link BasicReader}, or NULL if none configured
         */
        public static BasicReader getReader() {
-               if (defaultType != null) {
-                       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;