X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FBasicReader.java;h=bc3bf72f2ab7f3c576daddac33b39d4a2bfa8052;hp=eabbe7e4408ddf758c623fd65c835e1a3643a95a;hb=92fb0719f84f5b6734b51e528332546d78e9ccec;hpb=d98a29006897a1ae31ff3a039afe9643a48e0704

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index eabbe7e..bc3bf72 100644
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -8,6 +8,7 @@ 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.utils.ui.Progress;
 
 /**
  * The class that handles the different {@link Story} readers you can use.
@@ -78,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);
 		}
 	}
 
@@ -103,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: "