X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FLocalReader.java;h=29a840f3300d77c49ece90df927b23cc3d596a0f;hb=754a5bc205f6a50f3fe3fe7c2dfb09d8a8dd09bb;hp=6a66c199df79c4b6e48a4d189ecb7670e70c5175;hpb=10d558d2429c984327f9e5a16933fefe5cc37314;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/reader/LocalReader.java b/src/be/nikiroo/fanfix/reader/LocalReader.java
index 6a66c19..29a840f 100644
--- a/src/be/nikiroo/fanfix/reader/LocalReader.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReader.java
@@ -1,15 +1,26 @@
package be.nikiroo.fanfix.reader;
+import java.awt.Desktop;
import java.awt.EventQueue;
import java.io.File;
import java.io.IOException;
+import java.net.URISyntaxException;
+
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.Library;
+import be.nikiroo.fanfix.VersionCheck;
import be.nikiroo.fanfix.bundles.UiConfig;
+import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
class LocalReader extends BasicReader {
private Library lib;
@@ -22,29 +33,48 @@ class LocalReader extends BasicReader {
"Cannote create cache directory for local reader: " + dir);
}
- // TODO: can throw an exception, manage that (convert to IOEx ?)
- OutputType text = OutputType.valueOfNullOkUC(Instance.getUiConfig()
- .getString(UiConfig.LOCAL_READER_NON_IMAGES_DOCUMENT_TYPE));
- if (text == null) {
- text = OutputType.HTML;
- }
+ OutputType text = null;
+ OutputType images = null;
+
+ try {
+ text = OutputType.valueOfNullOkUC(Instance.getUiConfig().getString(
+ UiConfig.NON_IMAGES_DOCUMENT_TYPE));
+ if (text == null) {
+ text = OutputType.HTML;
+ }
- OutputType images = OutputType.valueOfNullOkUC(Instance.getUiConfig()
- .getString(UiConfig.LOCAL_READER_IMAGES_DOCUMENT_TYPE));
- if (images == null) {
- images = OutputType.CBZ;
+ images = OutputType.valueOfNullOkUC(Instance.getUiConfig()
+ .getString(UiConfig.IMAGES_DOCUMENT_TYPE));
+ if (images == null) {
+ images = OutputType.CBZ;
+ }
+ } catch (Exception e) {
+ UiConfig key = (text == null) ? UiConfig.NON_IMAGES_DOCUMENT_TYPE
+ : UiConfig.IMAGES_DOCUMENT_TYPE;
+ String value = Instance.getUiConfig().getString(key);
+
+ throw new IOException(
+ String.format(
+ "The configuration option %s is not valid: %s",
+ key, value), e);
}
- //
lib = new Library(dir, text, images);
}
@Override
public void read() throws IOException {
+ if (getStory() == null) {
+ throw new IOException("No story to read");
+ }
+
+ open(getStory().getMeta().getLuid(), null);
}
@Override
- public void read(int chapter) {
+ public void read(int chapter) throws IOException {
+ // TODO: show a special page?
+ read();
}
/**
@@ -104,27 +134,124 @@ class LocalReader extends BasicReader {
return file;
}
+ /**
+ * Check if the {@link Story} denoted by this Library UID is present in the
+ * {@link LocalReader} cache.
+ *
+ * @param luid
+ * the Library UID
+ *
+ * @return TRUE if it is
+ */
public boolean isCached(String luid) {
return lib.getInfo(luid) != null;
}
@Override
public void start(String type) {
+ // TODO: improve presentation of update message
+ final VersionCheck updates = VersionCheck.check();
+ StringBuilder builder = new StringBuilder();
+
+ final JEditorPane updateMessage = new JEditorPane("text/html", "");
+ if (updates.isNewVersionAvailable()) {
+ builder.append("A new version of the program is available at https://github.com/nikiroo/fanfix/releases");
+ builder.append("
");
+ builder.append("
");
+ for (Version v : updates.getNewer()) {
+ builder.append("\tVersion " + v + "");
+ builder.append("
");
+ builder.append("