X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FGuiReaderFrame.java;h=cd321ab49ad15ee7ebe5e6262074f9040bd10d25;hb=62c63b0724f4bc45999cb2e7186b4b3ada479a0a;hp=3b5fca34bc9de09aeb2dadea9d67a3889dad9838;hpb=14b574483b51d3859acef6a269f8841b5a4eb5f8;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/reader/GuiReaderFrame.java b/src/be/nikiroo/fanfix/reader/GuiReaderFrame.java
index 3b5fca3..cd321ab 100644
--- a/src/be/nikiroo/fanfix/reader/GuiReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/GuiReaderFrame.java
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
 import javax.swing.BoxLayout;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
@@ -29,6 +30,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
@@ -66,6 +68,21 @@ class GuiReaderFrame extends JFrame {
 	private GuiReaderBook selectedBook;
 	private boolean words; // words or authors (secondary info on books)
 
+	/**
+	 * A {@link Runnable} with a {@link Story} parameter.
+	 * 
+	 * @author niki
+	 */
+	private interface StoryRunnable {
+		/**
+		 * Run the action.
+		 * 
+		 * @param story
+		 *            the story
+		 */
+		public void run(Story story);
+	}
+
 	/**
 	 * Create a new {@link GuiReaderFrame}.
 	 * 
@@ -97,6 +114,12 @@ class GuiReaderFrame extends JFrame {
 		scroll.getVerticalScrollBar().setUnitIncrement(16);
 		add(scroll, BorderLayout.CENTER);
 
+		String message = reader.getLibrary().getLibraryName();
+		if (!message.isEmpty()) {
+			JLabel name = new JLabel(message, SwingConstants.CENTER);
+			add(name, BorderLayout.NORTH);
+		}
+
 		pgBar = new ProgressBar();
 		add(pgBar, BorderLayout.SOUTH);
 
@@ -533,7 +556,7 @@ class GuiReaderFrame extends JFrame {
 											selectedBook.getMeta().getLuid(),
 											type, path, pg);
 								} catch (IOException e) {
-									Instance.syserr(e);
+									Instance.getTraceHandler().error(e);
 								}
 							}
 						});
@@ -585,6 +608,7 @@ class GuiReaderFrame extends JFrame {
 							reader.clearLocalReaderCache(selectedBook.getMeta()
 									.getLuid());
 							selectedBook.setCached(false);
+							GuiReaderBook.clearIcon(selectedBook.getMeta());
 							SwingUtilities.invokeLater(new Runnable() {
 								@Override
 								public void run() {
@@ -678,11 +702,16 @@ class GuiReaderFrame extends JFrame {
 			public void actionPerformed(ActionEvent e) {
 				if (selectedBook != null) {
 					final MetaData meta = selectedBook.getMeta();
-					imprt(meta.getUrl(), new Runnable() {
+					imprt(meta.getUrl(), new StoryRunnable() {
 						@Override
-						public void run() {
+						public void run(Story story) {
 							reader.delete(meta.getLuid());
 							GuiReaderFrame.this.selectedBook = null;
+							MetaData newMeta = story.getMeta();
+							if (!newMeta.getSource().equals(meta.getSource())) {
+								reader.changeType(newMeta.getLuid(),
+										meta.getSource());
+							}
 						}
 					}, "Removing old copy");
 				}
@@ -757,6 +786,9 @@ class GuiReaderFrame extends JFrame {
 					reader.getLibrary().setSourceCover(
 							selectedBook.getMeta().getSource(),
 							selectedBook.getMeta().getLuid());
+					MetaData source = selectedBook.getMeta().clone();
+					source.setLuid(null);
+					GuiReaderBook.clearIcon(source);
 				}
 			}
 		});
@@ -785,7 +817,7 @@ class GuiReaderFrame extends JFrame {
 					});
 				} catch (IOException e) {
 					// TODO: error message?
-					Instance.syserr(e);
+					Instance.getTraceHandler().error(e);
 				}
 			}
 		});
@@ -882,7 +914,7 @@ class GuiReaderFrame extends JFrame {
 	 * @param onSuccess
 	 *            Action to execute on success
 	 */
-	private void imprt(final String url, final Runnable onSuccess,
+	private void imprt(final String url, final StoryRunnable onSuccess,
 			String onSuccessPgName) {
 		final Progress pg = new Progress();
 		final Progress pgImprt = new Progress();
@@ -894,8 +926,10 @@ class GuiReaderFrame extends JFrame {
 			@Override
 			public void run() {
 				Exception ex = null;
+				Story story = null;
 				try {
-					reader.getLibrary().imprt(BasicReader.getUrl(url), pgImprt);
+					story = reader.getLibrary().imprt(BasicReader.getUrl(url),
+							pgImprt);
 				} catch (IOException e) {
 					ex = e;
 				}
@@ -906,7 +940,7 @@ class GuiReaderFrame extends JFrame {
 
 				pgOnSuccess.setProgress(0);
 				if (!ok) {
-					Instance.syserr(e);
+					Instance.getTraceHandler().error(e);
 					SwingUtilities.invokeLater(new Runnable() {
 						@Override
 						public void run() {
@@ -917,7 +951,7 @@ class GuiReaderFrame extends JFrame {
 					});
 				} else {
 					if (onSuccess != null) {
-						onSuccess.run();
+						onSuccess.run(story);
 					}
 				}
 				pgOnSuccess.done();