X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FLocalReaderFrame.java;h=4e8d9ace0f801b45f3089152c534a45dc6ef3aaa;hp=16684f946aa5cf0744780cabc1caa2cc4a13b75e;hb=5130ce84f2b7fce5b451aed15fdaa12bc663331f;hpb=edd4628984f5f06e955606651fc828ac839f7f43
diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
index 16684f9..4e8d9ac 100644
--- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
@@ -3,6 +3,8 @@ package be.nikiroo.fanfix.reader;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Frame;
+import java.awt.Toolkit;
+import java.awt.datatransfer.DataFlavor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
@@ -38,6 +40,7 @@ import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.fanfix.reader.LocalReaderBook.BookActionListener;
import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
import be.nikiroo.utils.ui.ProgressBar;
import be.nikiroo.utils.ui.WrapLayout;
@@ -71,7 +74,7 @@ class LocalReaderFrame extends JFrame {
* the type of {@link Story} to load, or NULL for all types
*/
public LocalReaderFrame(LocalReader reader, String type) {
- super("Fanfix Library");
+ super(String.format("Fanfix %s Library", Version.getCurrentVersion()));
this.reader = reader;
@@ -136,7 +139,8 @@ class LocalReaderFrame extends JFrame {
popup.add(createMenuItemOpenBook());
popup.addSeparator();
popup.add(createMenuItemExport());
- popup.add(createMenuItemRefresh());
+ popup.add(createMenuItemClearCache());
+ popup.add(createMenuItemRedownload());
popup.addSeparator();
popup.add(createMenuItemDelete());
popup.show(e.getComponent(), e.getX(), e.getY());
@@ -165,13 +169,13 @@ class LocalReaderFrame extends JFrame {
JMenu file = new JMenu("File");
file.setMnemonic(KeyEvent.VK_F);
- JMenuItem imprt = new JMenuItem("Import URL", KeyEvent.VK_U);
+ JMenuItem imprt = new JMenuItem("Import URL...", KeyEvent.VK_U);
imprt.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
imprt(true);
}
});
- JMenuItem imprtF = new JMenuItem("Import File", KeyEvent.VK_F);
+ JMenuItem imprtF = new JMenuItem("Import File...", KeyEvent.VK_F);
imprtF.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
imprt(false);
@@ -198,7 +202,8 @@ class LocalReaderFrame extends JFrame {
JMenu edit = new JMenu("Edit");
edit.setMnemonic(KeyEvent.VK_E);
- edit.add(createMenuItemRefresh());
+ edit.add(createMenuItemClearCache());
+ edit.add(createMenuItemRedownload());
edit.addSeparator();
edit.add(createMenuItemDelete());
@@ -274,7 +279,8 @@ class LocalReaderFrame extends JFrame {
public void run() {
try {
Instance.getLibrary().export(
- selectedBook.getLuid(), type, path, pg);
+ selectedBook.getMeta().getLuid(), type,
+ path, pg);
} catch (IOException e) {
Instance.syserr(e);
}
@@ -315,14 +321,14 @@ class LocalReaderFrame extends JFrame {
*
* @return the item
*/
- private JMenuItem createMenuItemRefresh() {
+ private JMenuItem createMenuItemClearCache() {
JMenuItem refresh = new JMenuItem("Clear cache", KeyEvent.VK_C);
refresh.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (selectedBook != null) {
outOfUi(null, new Runnable() {
public void run() {
- reader.refresh(selectedBook.getLuid());
+ reader.refresh(selectedBook.getMeta().getLuid());
selectedBook.setCached(false);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@@ -338,6 +344,29 @@ class LocalReaderFrame extends JFrame {
return refresh;
}
+ /**
+ * Create the redownload (then delete original) menu item.
+ *
+ * @return the item
+ */
+ private JMenuItem createMenuItemRedownload() {
+ JMenuItem refresh = new JMenuItem("Redownload", KeyEvent.VK_R);
+ refresh.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (selectedBook != null) {
+ imprt(selectedBook.getMeta().getUrl(), new Runnable() {
+ public void run() {
+ reader.delete(selectedBook.getMeta().getLuid());
+ selectedBook = null;
+ }
+ });
+ }
+ }
+ });
+
+ return refresh;
+ }
+
/**
* Create the delete menu item.
*
@@ -350,7 +379,7 @@ class LocalReaderFrame extends JFrame {
if (selectedBook != null) {
outOfUi(null, new Runnable() {
public void run() {
- reader.delete(selectedBook.getLuid());
+ reader.delete(selectedBook.getMeta().getLuid());
selectedBook = null;
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@@ -395,7 +424,7 @@ class LocalReaderFrame extends JFrame {
outOfUi(pg, new Runnable() {
public void run() {
try {
- reader.open(book.getLuid(), pg);
+ reader.open(book.getMeta().getLuid(), pg);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
book.setCached(true);
@@ -424,15 +453,11 @@ class LocalReaderFrame extends JFrame {
private void outOfUi(final Progress pg, final Runnable run) {
pgBar.setProgress(pg);
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- setEnabled(false);
- pgBar.addActioListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- pgBar.setProgress(null);
- setEnabled(true);
- }
- });
+ setEnabled(false);
+ pgBar.addActioListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ pgBar.setProgress(null);
+ setEnabled(true);
}
});
@@ -454,6 +479,8 @@ class LocalReaderFrame extends JFrame {
/**
* Import a {@link Story} into the main {@link Library}.
+ *
+ * Should be called inside the UI thread.
*
* @param askUrl
* TRUE for an {@link URL}, false for a {@link File}
@@ -461,48 +488,80 @@ class LocalReaderFrame extends JFrame {
private void imprt(boolean askUrl) {
JFileChooser fc = new JFileChooser();
- final String url;
+ Object url;
if (askUrl) {
+ String clipboard = "";
+ try {
+ clipboard = ("" + Toolkit.getDefaultToolkit()
+ .getSystemClipboard().getData(DataFlavor.stringFlavor))
+ .trim();
+ } catch (Exception e) {
+ // No data will be handled
+ }
+
+ if (clipboard == null || !clipboard.startsWith("http")) {
+ clipboard = "";
+ }
+
url = JOptionPane.showInputDialog(LocalReaderFrame.this,
"url of the story to import?", "Importing from URL",
- JOptionPane.QUESTION_MESSAGE);
+ JOptionPane.QUESTION_MESSAGE, null, null, clipboard);
} else if (fc.showOpenDialog(this) != JFileChooser.CANCEL_OPTION) {
url = fc.getSelectedFile().getAbsolutePath();
} else {
url = null;
}
- if (url != null && !url.isEmpty()) {
- final Progress pg = new Progress("Importing " + url);
- outOfUi(pg, new Runnable() {
- public void run() {
- Exception ex = null;
- try {
- Instance.getLibrary()
- .imprt(BasicReader.getUrl(url), pg);
- } catch (IOException e) {
- ex = e;
- }
+ if (url != null && !url.toString().isEmpty()) {
+ imprt(url.toString(), null);
+ }
+ }
+
+ /**
+ * Actually import the {@link Story} into the main {@link Library}.
+ *
+ * Should be called inside the UI thread.
+ *
+ * @param url
+ * the {@link Story} to import by {@link URL}
+ * @param onSuccess
+ * Action to execute on success
+ */
+ private void imprt(final String url, final Runnable onSuccess) {
+ final Progress pg = new Progress("Importing " + url);
+ outOfUi(pg, new Runnable() {
+ public void run() {
+ Exception ex = null;
+ try {
+ Instance.getLibrary().imprt(BasicReader.getUrl(url), pg);
+ } catch (IOException e) {
+ ex = e;
+ }
- final Exception e = ex;
+ final Exception e = ex;
- final boolean ok = (e == null);
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- if (!ok) {
- JOptionPane.showMessageDialog(
- LocalReaderFrame.this,
- "Cannot import: " + url,
- e.getMessage(),
- JOptionPane.ERROR_MESSAGE);
- } else {
+ final boolean ok = (e == null);
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ if (!ok) {
+ Instance.syserr(e);
+ JOptionPane.showMessageDialog(
+ LocalReaderFrame.this, "Cannot import: "
+ + url, e.getMessage(),
+ JOptionPane.ERROR_MESSAGE);
+
+ setEnabled(true);
+ } else {
+ refreshBooks(type);
+ if (onSuccess != null) {
+ onSuccess.run();
refreshBooks(type);
}
}
- });
- }
- });
- }
+ }
+ });
+ }
+ });
}
/**