X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FBasicReader.java;h=cbd4e0308a4584895b805d7ed3ac8bbdaf2c3732;hb=e42573a004fac26378c693ce9ef0d6319713c682;hp=05e3e3df1124b6eae858e536e5b57adec2db78e2;hpb=b0e88ebd20f8b2950c382694e936da76ac3596b6;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java index 05e3e3d..cbd4e03 100644 --- a/src/be/nikiroo/fanfix/reader/BasicReader.java +++ b/src/be/nikiroo/fanfix/reader/BasicReader.java @@ -7,11 +7,12 @@ import java.net.MalformedURLException; import java.net.URL; import be.nikiroo.fanfix.Instance; -import be.nikiroo.fanfix.Library; 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.serial.SerialUtils; @@ -23,38 +24,12 @@ import be.nikiroo.utils.serial.SerialUtils; * * @author niki */ -public abstract class BasicReader { - public enum ReaderType { - /** Simple reader that outputs everything on the console */ - CLI, - /** Reader that starts local programs to handle the stories */ - GUI, - /** A text (UTF-8) reader with menu and text windows */ - TUI, - - ; - - public String getTypeName() { - String pkg = "be.nikiroo.fanfix.reader."; - switch (this) { - case CLI: - return pkg + "CliReader"; - case TUI: - return pkg + "TuiReader"; - case GUI: - return pkg + "LocalReader"; - } - - return null; - } - } - - private static Library defaultLibrary = Instance.getLibrary(); +public abstract class BasicReader implements Reader { + private static BasicLibrary defaultLibrary = Instance.getLibrary(); private static ReaderType defaultType = ReaderType.GUI; - private Library lib; + private BasicLibrary lib; private Story story; - private ReaderType type; /** * Take the default reader type configuration from the config file. @@ -71,42 +46,11 @@ public abstract class BasicReader { } } - /** - * The type of this reader. - * - * @return the type - */ - public ReaderType getType() { - return type; - } - - /** - * The type of this reader. - * - * @param type - * the new type - */ - protected BasicReader setType(ReaderType type) { - this.type = type; - return this; - } - - /** - * Return the current {@link Story}. - * - * @return the {@link Story} - */ public Story getStory() { return story; } - /** - * The {@link Library} to load the stories from (by default, takes the - * default {@link Library}). - * - * @return the {@link Library} - */ - public Library getLibrary() { + public BasicLibrary getLibrary() { if (lib == null) { lib = defaultLibrary; } @@ -114,29 +58,10 @@ public abstract class BasicReader { return lib; } - /** - * Change the {@link Library} that will be managed by this - * {@link BasicReader}. - * - * @param lib - * the new {@link Library} - */ - public void setLibrary(Library lib) { + public void setLibrary(LocalLibrary lib) { this.lib = lib; } - /** - * Create a new {@link BasicReader} for a {@link Story} in the - * {@link Library}. - * - * @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, Progress pg) throws IOException { story = lib.getStory(luid, pg); if (story == null) { @@ -144,17 +69,6 @@ public abstract class BasicReader { } } - /** - * Create a new {@link BasicReader} for an external {@link Story}. - * - * @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, Progress pg) throws IOException { BasicSupport support = BasicSupport.getSupport(source); if (support == null) { @@ -170,40 +84,6 @@ public abstract class BasicReader { } } - /** - * Start the {@link Story} Reading. - * - * @throws IOException - * in case of I/O error or if the {@link Story} was not - * previously set - */ - public abstract void read() throws IOException; - - /** - * Read the selected chapter (starting at 1). - * - * @param chapter - * the chapter - * - * @throws IOException - * in case of I/O error or if the {@link Story} was not - * previously set - */ - public abstract void read(int chapter) throws IOException; - - /** - * Start the reader in browse mode for the given source (or pass NULL for - * all sources). - * - * @param library - * the library to browse - * - * @param source - * the type of {@link Story} to take into account, or NULL for - * all - */ - public abstract void browse(String source); - /** * Return a new {@link BasicReader} ready for use if one is configured. *

@@ -211,11 +91,11 @@ public abstract class BasicReader { * * @return a {@link BasicReader}, or NULL if none configured */ - public static BasicReader getReader() { + public static Reader getReader() { try { if (defaultType != null) { - return ((BasicReader) SerialUtils.createObject(defaultType - .getTypeName())).setType(defaultType); + return (Reader) SerialUtils.createObject(defaultType + .getTypeName()); } } catch (Exception e) { Instance.syserr(new Exception("Cannot create a reader of type: " @@ -247,12 +127,13 @@ public abstract class BasicReader { } /** - * Change the default {@link Library} to open with the {@link BasicReader}s. + * Change the default {@link LocalLibrary} to open with the + * {@link BasicReader}s. * * @param lib - * the new {@link Library} + * the new {@link LocalLibrary} */ - public static void setDefaultLibrary(Library lib) { + public static void setDefaultLibrary(BasicLibrary lib) { BasicReader.defaultLibrary = lib; } @@ -284,15 +165,37 @@ public abstract class BasicReader { return source; } - // open with external player the related file - public static void open(Library lib, String luid) throws IOException { + /** + * Open the {@link Story} with an external reader (the program will be + * passed the main file associated with this {@link Story}). + * + * @param lib + * the {@link BasicLibrary} to select the {@link Story} from + * @param luid + * the {@link Story} LUID + * + * @throws IOException + * in case of I/O error + */ + public static void open(BasicLibrary lib, String luid) throws IOException { MetaData meta = lib.getInfo(luid); File target = lib.getFile(luid); open(meta, target); } - // open with external player the related file + /** + * Open the {@link Story} with an external reader (the program will be + * passed the given target file). + * + * @param meta + * the {@link Story} to load + * @param target + * the target {@link File} + * + * @throws IOException + * in case of I/O error + */ protected static void open(MetaData meta, File target) throws IOException { String program = null; if (meta.isImageDocument()) {