X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FLocalReader.java;h=593f58b2122685034d3ad7b34e4c230467e1ed0f;hp=a28d4feadeeeb4502da949661923619acc16d241;hb=68e2c6d20049d713de1bd31b749450b2f60d8340;hpb=bee7dffea9ef8d3312eee90993a9faaeac6c1127 diff --git a/src/be/nikiroo/fanfix/reader/LocalReader.java b/src/be/nikiroo/fanfix/reader/LocalReader.java index a28d4fe..593f58b 100644 --- a/src/be/nikiroo/fanfix/reader/LocalReader.java +++ b/src/be/nikiroo/fanfix/reader/LocalReader.java @@ -1,20 +1,38 @@ 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.LocalLibrary; +import be.nikiroo.fanfix.VersionCheck; import be.nikiroo.fanfix.bundles.UiConfig; import be.nikiroo.fanfix.data.Story; import be.nikiroo.fanfix.output.BasicOutput.OutputType; -import be.nikiroo.utils.ui.Progress; +import be.nikiroo.utils.Progress; +import be.nikiroo.utils.Version; +import be.nikiroo.utils.ui.UIUtils; class LocalReader extends BasicReader { - private Library lib; + static private boolean nativeLookLoaded; + + private LocalLibrary localLibrary; public LocalReader() throws IOException { + if (!nativeLookLoaded) { + UIUtils.setLookAndFeel(); + nativeLookLoaded = true; + } + File dir = Instance.getReaderDir(); dir.mkdirs(); if (!dir.exists()) { @@ -22,29 +40,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; - OutputType images = OutputType.valueOfNullOkUC(Instance.getUiConfig() - .getString(UiConfig.LOCAL_READER_IMAGES_DOCUMENT_TYPE)); - if (images == null) { - images = OutputType.CBZ; + try { + text = OutputType.valueOfNullOkUC(Instance.getUiConfig().getString( + UiConfig.NON_IMAGES_DOCUMENT_TYPE)); + if (text == null) { + text = OutputType.HTML; + } + + 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); + localLibrary = new LocalLibrary(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(); } /** @@ -70,7 +107,7 @@ class LocalReader extends BasicReader { try { Story story = Instance.getLibrary().getStory(luid, pgGetStory); if (story != null) { - story = lib.save(story, luid, pgSave); + story = localLibrary.save(story, luid, pgSave); } else { throw new IOException("Cannot find story in Library: " + luid); } @@ -82,36 +119,118 @@ class LocalReader extends BasicReader { } /** - * Get the target file related to this {@link Story}. + * Check if the {@link Story} denoted by this Library UID is present in the + * {@link LocalReader} cache. * * @param luid - * the LUID of the {@link Story} - * @param pg - * the optional progress reporter - * - * @return the target file + * the Library UID * - * @throws IOException - * in case of I/O error + * @return TRUE if it is */ - public File getTarget(String luid, Progress pg) throws IOException { - File file = lib.getFile(luid); - if (file == null) { - imprt(luid, pg); - file = lib.getFile(luid); - } - - return file; + public boolean isCached(String luid) { + return localLibrary.getInfo(luid) != null; } @Override - public void start(String type) { + public void browse(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(""); + } + + // html content + updateMessage.setText("" // + + builder// + + ""); + + // handle link events + updateMessage.addHyperlinkListener(new HyperlinkListener() { + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType().equals( + HyperlinkEvent.EventType.ACTIVATED)) + try { + Desktop.getDesktop().browse(e.getURL().toURI()); + } catch (IOException ee) { + Instance.syserr(ee); + } catch (URISyntaxException ee) { + Instance.syserr(ee); + } + } + }); + updateMessage.setEditable(false); + updateMessage.setBackground(new JLabel().getBackground()); + } + final String typeFinal = type; EventQueue.invokeLater(new Runnable() { public void run() { + if (updates.isNewVersionAvailable()) { + int rep = JOptionPane.showConfirmDialog(null, + updateMessage, "Updates available", + JOptionPane.OK_CANCEL_OPTION); + if (rep == JOptionPane.OK_OPTION) { + updates.ok(); + } else { + updates.ignore(); + } + } + new LocalReaderFrame(LocalReader.this, typeFinal) .setVisible(true); } }); } + + // delete from local reader library + void clearLocalReaderCache(String luid) { + try { + localLibrary.delete(luid); + } catch (IOException e) { + Instance.syserr(e); + } + } + + // delete from main library + void delete(String luid) { + try { + localLibrary.delete(luid); + Instance.getLibrary().delete(luid); + } catch (IOException e) { + Instance.syserr(e); + } + } + + // open the given book + void open(String luid, Progress pg) throws IOException { + File file = localLibrary.getFile(luid); + if (file == null) { + imprt(luid, pg); + file = localLibrary.getFile(luid); + } + + open(getLibrary().getInfo(luid), file); + } + + void changeType(String luid, String newType) { + try { + localLibrary.changeSource(luid, newType, null); + Instance.getLibrary().changeSource(luid, newType, null); + } catch (IOException e) { + Instance.syserr(e); + } + } }