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

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index eeb00af..bc3bf72 100644
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -5,14 +5,15 @@ 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;
+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
  */
@@ -24,12 +25,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
+			}
+		}
 	}
 
 	/**
@@ -67,11 +79,14 @@ 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) {
 			throw new IOException("Cannot retrieve story from library: " + luid);
 		}
@@ -82,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: "
@@ -125,19 +143,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;