X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FBasicReader.java;h=9ec08798e111e6f3325a080f2641d742f6a410cc;hp=7f79da3a8ec62b854b7bcdba62838a23779fcaf4;hb=d7367179b645781b4e0e4fc24893cb1e6725c14c;hpb=1387a30ab59dbf4071f2c5e5e0e08ca98c75b726

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index 7f79da3..9ec0879 100644
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -11,171 +11,18 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import be.nikiroo.fanfix.Instance;
-import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.library.BasicLibrary;
-import be.nikiroo.fanfix.library.LocalLibrary;
-import be.nikiroo.fanfix.supported.BasicSupport;
-import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
-import be.nikiroo.utils.serial.SerialUtils;
 
 /**
  * The class that handles the different {@link Story} readers you can use.
- * <p>
- * All the readers should be accessed via {@link BasicReader#getReader()}.
  * 
  * @author niki
  */
-public abstract class BasicReader implements Reader {
-	private static BasicLibrary defaultLibrary = Instance.getInstance().getLibrary();
-	private static ReaderType defaultType = ReaderType.GUI;
-
-	private BasicLibrary lib;
-	private MetaData meta;
-	private Story story;
-	private int chapter;
-
-	/**
-	 * Take the default reader type configuration from the config file.
-	 */
-	static {
-		String typeString = Instance.getInstance().getConfig().getString(Config.READER_TYPE);
-		if (typeString != null && !typeString.isEmpty()) {
-			try {
-				ReaderType type = ReaderType.valueOf(typeString.toUpperCase());
-				defaultType = type;
-			} catch (IllegalArgumentException e) {
-				// Do nothing
-			}
-		}
-	}
-
-	@Override
-	public synchronized Story getStory(Progress pg) throws IOException {
-		if (story == null) {
-			story = getLibrary().getStory(meta.getLuid(), pg);
-		}
-
-		return story;
-	}
-
-	@Override
-	public BasicLibrary getLibrary() {
-		if (lib == null) {
-			lib = defaultLibrary;
-		}
-
-		return lib;
-	}
-
-	@Override
-	public void setLibrary(BasicLibrary lib) {
-		this.lib = lib;
-	}
-
-	@Override
-	public synchronized MetaData getMeta() {
-		return meta;
-	}
-
-	@Override
-	public synchronized void setMeta(MetaData meta) throws IOException {
-		setMeta(meta == null ? null : meta.getLuid()); // must check the library
-	}
-
-	@Override
-	public synchronized void setMeta(String luid) throws IOException {
-		story = null;
-		meta = getLibrary().getInfo(luid);
-
-		if (meta == null) {
-			throw new IOException("Cannot retrieve story from library: " + luid);
-		}
-	}
-
-	@Override
-	public synchronized void setMeta(URL url, Progress pg) throws IOException {
-		BasicSupport support = BasicSupport.getSupport(url);
-		if (support == null) {
-			throw new IOException("URL not supported: " + url.toString());
-		}
-
-		story = support.process(pg);
-		if (story == null) {
-			throw new IOException(
-					"Cannot retrieve story from external source: "
-							+ url.toString());
-		}
-
-		meta = story.getMeta();
-	}
-
-	@Override
-	public int getChapter() {
-		return chapter;
-	}
-
-	@Override
-	public void setChapter(int chapter) {
-		this.chapter = chapter;
-	}
-
-	/**
-	 * Return a new {@link BasicReader} ready for use if one is configured.
-	 * <p>
-	 * Can return NULL if none are configured.
-	 * 
-	 * @return a {@link BasicReader}, or NULL if none configured
-	 */
-	public static Reader getReader() {
-		try {
-			if (defaultType != null) {
-				return (Reader) SerialUtils.createObject(defaultType
-						.getTypeName());
-			}
-		} catch (Exception e) {
-			Instance.getInstance().getTraceHandler()
-					.error(new Exception("Cannot create a reader of type: " + defaultType + " (Not compiled in?)", e));
-		}
-
-		return null;
-	}
-
-	/**
-	 * The default {@link Reader.ReaderType} used when calling
-	 * {@link BasicReader#getReader()}.
-	 * 
-	 * @return the default type
-	 */
-	public static ReaderType getDefaultReaderType() {
-		return defaultType;
-	}
-
-	/**
-	 * The default {@link Reader.ReaderType} used when calling
-	 * {@link BasicReader#getReader()}.
-	 * 
-	 * @param defaultType
-	 *            the new default type
-	 */
-	public static void setDefaultReaderType(ReaderType defaultType) {
-		BasicReader.defaultType = defaultType;
-	}
-
-	/**
-	 * Change the default {@link LocalLibrary} to open with the
-	 * {@link BasicReader}s.
-	 * 
-	 * @param lib
-	 *            the new {@link LocalLibrary}
-	 */
-	public static void setDefaultLibrary(BasicLibrary lib) {
-		BasicReader.defaultLibrary = lib;
-	}
-
+public abstract class BasicReader {
 	/**
 	 * Return an {@link URL} from this {@link String}, be it a file path or an
 	 * actual {@link URL}.
@@ -263,7 +110,6 @@ public abstract class BasicReader implements Reader {
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	@Override
 	public void openExternal(BasicLibrary lib, String luid, boolean sync)
 			throws IOException {
 		MetaData meta = lib.getInfo(luid);