X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FReader.java;h=b001e304842f4956095050160d5bf65b8795d3f3;hb=350bc060516184774f8116e61696a8c3c45ba85d;hp=d7285785b6513dc76badadb96ad8ce49a620e9be;hpb=e42573a004fac26378c693ce9ef0d6319713c682;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/Reader.java b/src/be/nikiroo/fanfix/reader/Reader.java
index d728578..b001e30 100644
--- a/src/be/nikiroo/fanfix/reader/Reader.java
+++ b/src/be/nikiroo/fanfix/reader/Reader.java
@@ -3,11 +3,17 @@ package be.nikiroo.fanfix.reader;
 import java.io.IOException;
 import java.net.URL;
 
+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.utils.Progress;
 
+/**
+ * A {@link Reader} is a class that will handle {@link Story} reading and
+ * browsing.
+ * 
+ * @author niki
+ */
 public interface Reader {
 	/**
 	 * A type of {@link BasicReader}.
@@ -21,6 +27,8 @@ public interface Reader {
 		GUI,
 		/** A text (UTF-8) reader with menu and text windows */
 		TUI,
+		/** A GUI reader implemented with the Android framework */
+		ANDROID,
 
 		;
 
@@ -34,57 +42,80 @@ public interface Reader {
 			String pkg = "be.nikiroo.fanfix.reader.";
 			switch (this) {
 			case CLI:
-				return pkg + "CliReader";
+				return pkg + "cli.CliReader";
 			case TUI:
-				return pkg + "TuiReader";
+				return pkg + "tui.TuiReader";
 			case GUI:
-				return pkg + "GuiReader";
+				return pkg + "ui.GuiReader";
+			case ANDROID:
+				return pkg + "android.AndroidReader";
 			}
 
 			return null;
 		}
-	};
+	}
 
 	/**
-	 * Return the current {@link Story}.
+	 * Return the current target {@link MetaData}.
+	 * 
+	 * @return the meta
+	 */
+	public MetaData getMeta();
+
+	/**
+	 * Return the current {@link Story} as described by the current
+	 * {@link MetaData}.
+	 * 
+	 * @param pg
+	 *            the optional progress
 	 * 
 	 * @return the {@link Story}
 	 */
-	public Story getStory();
+	public Story getStory(Progress pg);
 
 	/**
-	 * The {@link LocalLibrary} to load the stories from (by default, takes the
-	 * default {@link LocalLibrary}).
+	 * The {@link BasicLibrary} to load the stories from (by default, takes the
+	 * default {@link BasicLibrary}).
 	 * 
-	 * @return the {@link LocalLibrary}
+	 * @return the {@link BasicLibrary}
 	 */
 	public BasicLibrary getLibrary();
 
 	/**
-	 * Change the {@link LocalLibrary} that will be managed by this
+	 * Change the {@link BasicLibrary} that will be managed by this
 	 * {@link BasicReader}.
 	 * 
 	 * @param lib
-	 *            the new {@link LocalLibrary}
+	 *            the new {@link BasicLibrary}
 	 */
-	public void setLibrary(LocalLibrary lib);
+	public void setLibrary(BasicLibrary lib);
 
 	/**
-	 * Create a new {@link BasicReader} for a {@link Story} in the
-	 * {@link LocalLibrary}.
+	 * Set a {@link Story} from the current {@link BasicLibrary} into the
+	 * {@link Reader}.
 	 * 
 	 * @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;
+	public void setMeta(String luid) throws IOException;
 
 	/**
-	 * Create a new {@link BasicReader} for an external {@link Story}.
+	 * Set a {@link Story} from the current {@link BasicLibrary} into the
+	 * {@link Reader}.
+	 * 
+	 * @param meta
+	 *            the meta
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public void setMeta(MetaData meta) throws IOException;
+
+	/**
+	 * Set an external {@link Story} into this {@link Reader}.
 	 * 
 	 * @param source
 	 *            the {@link Story} {@link URL}
@@ -94,32 +125,43 @@ public interface Reader {
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	public void setStory(URL source, Progress pg) throws IOException;
+	public void setMeta(URL source, Progress pg) throws IOException;
 
 	/**
 	 * Start the {@link Story} Reading.
 	 * 
+	 * @param sync
+	 *            execute the process synchronously (wait until it is terminated
+	 *            before returning)
+	 * 
 	 * @throws IOException
 	 *             in case of I/O error or if the {@link Story} was not
 	 *             previously set
 	 */
-	public void read() throws IOException;
+	public void read(boolean sync) throws IOException;
 
 	/**
-	 * Read the selected chapter (starting at 1).
+	 * The selected chapter to start reading at (starting at 1, 0 = description,
+	 * -1 = none).
 	 * 
-	 * @param chapter
-	 *            the chapter
+	 * @return the chapter, or -1 for "no chapter"
+	 */
+	public int getChapter();
+
+	/**
+	 * The selected chapter to start reading at (starting at 1, 0 = description,
+	 * -1 = none).
 	 * 
-	 * @throws IOException
-	 *             in case of I/O error or if the {@link Story} was not
-	 *             previously set
+	 * @param chapter
+	 *            the chapter, or -1 for "no chapter"
 	 */
-	public void read(int chapter) throws IOException;
+	public void setChapter(int chapter);
 
 	/**
 	 * Start the reader in browse mode for the given source (or pass NULL for
 	 * all sources).
+	 * <p>
+	 * Note that this must be a <b>synchronous</b> action.
 	 * 
 	 * @param source
 	 *            the type of {@link Story} to take into account, or NULL for
@@ -127,4 +169,21 @@ public interface Reader {
 	 */
 	public void browse(String source);
 
+	/**
+	 * Open the {@link Story} with an external reader (the program should 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
+	 * @param sync
+	 *            execute the process synchronously (wait until it is terminated
+	 *            before returning)
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public void openExternal(BasicLibrary lib, String luid, boolean sync)
+			throws IOException;
 }