X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FLocalReaderFrame.java;h=03df7fbdf5cf133d86ac5d11634392e7edb61632;hp=4e8d9ace0f801b45f3089152c534a45dc6ef3aaa;hb=70c9b112926f1cf95b2fddd0bb504ab37d6ddd1e;hpb=5130ce84f2b7fce5b451aed15fdaa12bc663331f

diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
index 4e8d9ac..03df7fb 100644
--- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.swing.BoxLayout;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
@@ -34,6 +35,7 @@ import javax.swing.filechooser.FileNameExtensionFilter;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.Library;
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
@@ -41,8 +43,8 @@ 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.ConfigEditor;
 import be.nikiroo.utils.ui.ProgressBar;
-import be.nikiroo.utils.ui.WrapLayout;
 
 /**
  * A {@link Frame} that will show a {@link LocalReaderBook} item for each
@@ -55,14 +57,14 @@ import be.nikiroo.utils.ui.WrapLayout;
 class LocalReaderFrame extends JFrame {
 	private static final long serialVersionUID = 1L;
 	private LocalReader reader;
-	private List<MetaData> stories;
-	private List<LocalReaderBook> books;
-	private JPanel bookPane;
-	private String type;
+	private Map<LocalReaderGroup, String> booksByType;
+	private Map<LocalReaderGroup, String> booksByAuthor;
+	private JPanel pane;
 	private Color color;
 	private ProgressBar pgBar;
 	private JMenuBar bar;
 	private LocalReaderBook selectedBook;
+	private boolean words; // words or authors (secondary info on books)
 
 	/**
 	 * Create a new {@link LocalReaderFrame}.
@@ -82,80 +84,155 @@ class LocalReaderFrame extends JFrame {
 		setSize(800, 600);
 		setLayout(new BorderLayout());
 
-		books = new ArrayList<LocalReaderBook>();
-		bookPane = new JPanel(new WrapLayout(WrapLayout.LEADING, 5, 5));
+		pane = new JPanel();
+		pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
 
 		color = Instance.getUiConfig().getColor(UiConfig.BACKGROUND_COLOR);
-
 		if (color != null) {
 			setBackground(color);
-			bookPane.setBackground(color);
+			pane.setBackground(color);
 		}
 
-		JScrollPane scroll = new JScrollPane(bookPane);
+		JScrollPane scroll = new JScrollPane(pane);
 		scroll.getVerticalScrollBar().setUnitIncrement(16);
 		add(scroll, BorderLayout.CENTER);
 
 		pgBar = new ProgressBar();
 		add(pgBar, BorderLayout.SOUTH);
 
-		refreshBooks(type);
-		setJMenuBar(createMenu());
+		pgBar.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				invalidate();
+				pgBar.setProgress(null);
+				validate();
+				setEnabled(true);
+			}
+		});
+
+		pgBar.addUpdateListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				invalidate();
+				validate();
+				repaint();
+			}
+		});
+
+		booksByType = new HashMap<LocalReaderGroup, String>();
+		booksByAuthor = new HashMap<LocalReaderGroup, String>();
+
+		pane.setVisible(false);
+		final Progress pg = new Progress();
+		final String typeF = type;
+		outOfUi(pg, new Runnable() {
+			public void run() {
+				Instance.getLibrary().refresh(pg);
+				invalidate();
+				setJMenuBar(createMenu());
+				addBookPane(typeF, true);
+				refreshBooks();
+				validate();
+				pane.setVisible(true);
+			}
+		});
 
 		setVisible(true);
 	}
 
 	/**
-	 * Refresh the list of {@link LocalReaderBook}s from disk.
+	 * Add a new {@link LocalReaderGroup} on the frame to display the books of
+	 * the selected type or author.
 	 * 
+	 * @param value
+	 *            the author or the type, or NULL to get all the
+	 *            authors-or-types
 	 * @param type
-	 *            the type of {@link Story} to load, or NULL for all types
+	 *            TRUE for type, FALSE for author
 	 */
-	private void refreshBooks(String type) {
-		this.type = type;
-		stories = Instance.getLibrary().getList(type);
-		books.clear();
-		bookPane.invalidate();
-		bookPane.removeAll();
-		for (MetaData meta : stories) {
-			LocalReaderBook book = new LocalReaderBook(meta,
-					reader.isCached(meta.getLuid()));
-			if (color != null) {
-				book.setBackground(color);
-			}
-
-			books.add(book);
-
-			book.addActionListener(new BookActionListener() {
-				public void select(LocalReaderBook book) {
-					selectedBook = book;
-					for (LocalReaderBook abook : books) {
-						abook.setSelected(abook == book);
+	private void addBookPane(String value, boolean type) {
+		if (value == null) {
+			if (type) {
+				for (String tt : Instance.getLibrary().getTypes()) {
+					if (tt != null) {
+						addBookPane(tt, type);
 					}
 				}
-
-				public void popupRequested(LocalReaderBook book, MouseEvent e) {
-					JPopupMenu popup = new JPopupMenu();
-					popup.add(createMenuItemOpenBook());
-					popup.addSeparator();
-					popup.add(createMenuItemExport());
-					popup.add(createMenuItemClearCache());
-					popup.add(createMenuItemRedownload());
-					popup.addSeparator();
-					popup.add(createMenuItemDelete());
-					popup.show(e.getComponent(), e.getX(), e.getY());
+			} else {
+				for (String tt : Instance.getLibrary().getAuthors()) {
+					if (tt != null) {
+						addBookPane(tt, type);
+					}
 				}
+			}
 
-				public void action(final LocalReaderBook book) {
-					openBook(book);
-				}
-			});
+			return;
+		}
 
-			bookPane.add(book);
+		LocalReaderGroup bookPane = new LocalReaderGroup(reader, value, color);
+		if (type) {
+			booksByType.put(bookPane, value);
+		} else {
+			booksByAuthor.put(bookPane, value);
 		}
 
-		bookPane.validate();
-		bookPane.repaint();
+		this.invalidate();
+		pane.invalidate();
+		pane.add(bookPane);
+		pane.validate();
+		this.validate();
+
+		bookPane.setActionListener(new BookActionListener() {
+			public void select(LocalReaderBook book) {
+				selectedBook = book;
+			}
+
+			public void popupRequested(LocalReaderBook book, MouseEvent e) {
+				JPopupMenu popup = new JPopupMenu();
+				popup.add(createMenuItemOpenBook());
+				popup.addSeparator();
+				popup.add(createMenuItemExport());
+				popup.add(createMenuItemMove());
+				popup.add(createMenuItemClearCache());
+				popup.add(createMenuItemRedownload());
+				popup.addSeparator();
+				popup.add(createMenuItemDelete());
+				popup.show(e.getComponent(), e.getX(), e.getY());
+			}
+
+			public void action(final LocalReaderBook book) {
+				openBook(book);
+			}
+		});
+	}
+
+	private void removeBookPanes() {
+		booksByType.clear();
+		booksByAuthor.clear();
+		pane.invalidate();
+		this.invalidate();
+		pane.removeAll();
+		pane.validate();
+		this.validate();
+	}
+
+	/**
+	 * Refresh the list of {@link LocalReaderBook}s from disk.
+	 * 
+	 */
+	private void refreshBooks() {
+		for (LocalReaderGroup group : booksByType.keySet()) {
+			List<MetaData> stories = Instance.getLibrary().getListByType(
+					booksByType.get(group));
+			group.refreshBooks(stories, words);
+		}
+
+		for (LocalReaderGroup group : booksByAuthor.keySet()) {
+			List<MetaData> stories = Instance.getLibrary().getListByAuthor(
+					booksByAuthor.get(group));
+			group.refreshBooks(stories, words);
+		}
+
+		pane.repaint();
+		this.repaint();
 	}
 
 	/**
@@ -191,6 +268,7 @@ class LocalReaderFrame extends JFrame {
 
 		file.add(createMenuItemOpenBook());
 		file.add(createMenuItemExport());
+		file.add(createMenuItemMove());
 		file.addSeparator();
 		file.add(imprt);
 		file.add(imprtF);
@@ -211,28 +289,132 @@ class LocalReaderFrame extends JFrame {
 
 		JMenu view = new JMenu("View");
 		view.setMnemonic(KeyEvent.VK_V);
+		JMenuItem vauthors = new JMenuItem("Author");
+		vauthors.setMnemonic(KeyEvent.VK_A);
+		vauthors.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				words = false;
+				refreshBooks();
+			}
+		});
+		view.add(vauthors);
+		JMenuItem vwords = new JMenuItem("Word count");
+		vwords.setMnemonic(KeyEvent.VK_W);
+		vwords.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				words = true;
+				refreshBooks();
+			}
+		});
+		view.add(vwords);
+		bar.add(view);
+
+		JMenu sources = new JMenu("Sources");
+		sources.setMnemonic(KeyEvent.VK_S);
 
 		List<String> tt = Instance.getLibrary().getTypes();
 		tt.add(0, null);
 		for (final String type : tt) {
-			JMenuItem item = new JMenuItem(type == null ? "All books" : type);
+			JMenuItem item = new JMenuItem(type == null ? "All" : type);
 			item.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					refreshBooks(type);
+					removeBookPanes();
+					addBookPane(type, true);
+					refreshBooks();
 				}
 			});
-			view.add(item);
+			sources.add(item);
 
 			if (type == null) {
-				view.addSeparator();
+				sources.addSeparator();
 			}
 		}
 
-		bar.add(view);
+		bar.add(sources);
+
+		JMenu authors = new JMenu("Authors");
+		authors.setMnemonic(KeyEvent.VK_A);
+
+		List<String> aa = Instance.getLibrary().getAuthors();
+		aa.add(0, null);
+		for (final String author : aa) {
+			JMenuItem item = new JMenuItem(author == null ? "All"
+					: author.isEmpty() ? "[unknown]" : author);
+			item.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					removeBookPanes();
+					addBookPane(author, false);
+					refreshBooks();
+				}
+			});
+			authors.add(item);
+
+			if (author == null || author.isEmpty()) {
+				authors.addSeparator();
+			}
+		}
+
+		bar.add(authors);
+
+		JMenu options = new JMenu("Options");
+		options.setMnemonic(KeyEvent.VK_O);
+		options.add(createMenuItemConfig());
+		options.add(createMenuItemUiConfig());
+		bar.add(options);
 
 		return bar;
 	}
 
+	/**
+	 * Create the Fanfix Configuration menu item.
+	 * 
+	 * @return the item
+	 */
+	private JMenuItem createMenuItemConfig() {
+		final String title = "Fanfix Configuration";
+		JMenuItem item = new JMenuItem(title);
+		item.setMnemonic(KeyEvent.VK_F);
+
+		item.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				ConfigEditor<Config> ed = new ConfigEditor<Config>(
+						Config.class, Instance.getConfig(),
+						"This is where you configure the options of the program.");
+				JFrame frame = new JFrame(title);
+				frame.add(ed);
+				frame.setSize(800, 600);
+				frame.setVisible(true);
+			}
+		});
+
+		return item;
+	}
+
+	/**
+	 * Create the UI Configuration menu item.
+	 * 
+	 * @return the item
+	 */
+	private JMenuItem createMenuItemUiConfig() {
+		final String title = "UI Configuration";
+		JMenuItem item = new JMenuItem(title);
+		item.setMnemonic(KeyEvent.VK_U);
+
+		item.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				ConfigEditor<UiConfig> ed = new ConfigEditor<UiConfig>(
+						UiConfig.class, Instance.getUiConfig(),
+						"This is where you configure the graphical appearence of the program.");
+				JFrame frame = new JFrame(title);
+				frame.add(ed);
+				frame.setSize(800, 600);
+				frame.setVisible(true);
+			}
+		});
+
+		return item;
+	}
+
 	/**
 	 * Create the export menu item.
 	 * 
@@ -246,6 +428,7 @@ class LocalReaderFrame extends JFrame {
 		for (OutputType type : OutputType.values()) {
 			String ext = type.getDefaultExtension(false);
 			String desc = type.getDesc(false);
+
 			if (ext == null || ext.isEmpty()) {
 				filters.put(createAllFilter(desc), type);
 			} else {
@@ -271,21 +454,24 @@ class LocalReaderFrame extends JFrame {
 			public void actionPerformed(ActionEvent e) {
 				if (selectedBook != null) {
 					fc.showDialog(LocalReaderFrame.this, "Save");
-					final OutputType type = filters.get(fc.getFileFilter());
-					final String path = fc.getSelectedFile().getAbsolutePath()
-							+ type.getDefaultExtension(false);
-					final Progress pg = new Progress();
-					outOfUi(pg, new Runnable() {
-						public void run() {
-							try {
-								Instance.getLibrary().export(
-										selectedBook.getMeta().getLuid(), type,
-										path, pg);
-							} catch (IOException e) {
-								Instance.syserr(e);
+					if (fc.getSelectedFile() != null) {
+						final OutputType type = filters.get(fc.getFileFilter());
+						final String path = fc.getSelectedFile()
+								.getAbsolutePath()
+								+ type.getDefaultExtension(false);
+						final Progress pg = new Progress();
+						outOfUi(pg, new Runnable() {
+							public void run() {
+								try {
+									Instance.getLibrary().export(
+											selectedBook.getMeta().getLuid(),
+											type, path, pg);
+								} catch (IOException e) {
+									Instance.syserr(e);
+								}
 							}
-						}
-					});
+						});
+					}
 				}
 			}
 		});
@@ -328,7 +514,8 @@ class LocalReaderFrame extends JFrame {
 				if (selectedBook != null) {
 					outOfUi(null, new Runnable() {
 						public void run() {
-							reader.refresh(selectedBook.getMeta().getLuid());
+							reader.clearLocalReaderCache(selectedBook.getMeta()
+									.getLuid());
 							selectedBook.setCached(false);
 							SwingUtilities.invokeLater(new Runnable() {
 								public void run() {
@@ -344,6 +531,68 @@ class LocalReaderFrame extends JFrame {
 		return refresh;
 	}
 
+	/**
+	 * Create the delete menu item.
+	 * 
+	 * @return the item
+	 */
+	private JMenuItem createMenuItemMove() {
+		JMenu moveTo = new JMenu("Move to...");
+		moveTo.setMnemonic(KeyEvent.VK_M);
+
+		List<String> types = new ArrayList<String>();
+		types.add(null);
+		types.addAll(Instance.getLibrary().getTypes());
+
+		for (String type : types) {
+			JMenuItem item = new JMenuItem(type == null ? "New type..." : type);
+
+			moveTo.add(item);
+			if (type == null) {
+				moveTo.addSeparator();
+			}
+
+			final String ftype = type;
+			item.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					if (selectedBook != null) {
+						String type = ftype;
+						if (type == null) {
+							Object rep = JOptionPane.showInputDialog(
+									LocalReaderFrame.this, "Move to:",
+									"Moving story",
+									JOptionPane.QUESTION_MESSAGE, null, null,
+									selectedBook.getMeta().getSource());
+							if (rep == null) {
+								return;
+							} else {
+								type = rep.toString();
+							}
+						}
+
+						final String ftype = type;
+						outOfUi(null, new Runnable() {
+							public void run() {
+								reader.changeType(selectedBook.getMeta()
+										.getLuid(), ftype);
+
+								selectedBook = null;
+
+								SwingUtilities.invokeLater(new Runnable() {
+									public void run() {
+										setJMenuBar(createMenu());
+									}
+								});
+							}
+						});
+					}
+				}
+			});
+		}
+
+		return moveTo;
+	}
+
 	/**
 	 * Create the redownload (then delete original) menu item.
 	 * 
@@ -354,12 +603,13 @@ class LocalReaderFrame extends JFrame {
 		refresh.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				if (selectedBook != null) {
-					imprt(selectedBook.getMeta().getUrl(), new Runnable() {
+					final MetaData meta = selectedBook.getMeta();
+					imprt(meta.getUrl(), new Runnable() {
 						public void run() {
-							reader.delete(selectedBook.getMeta().getLuid());
-							selectedBook = null;
+							reader.delete(meta.getLuid());
+							LocalReaderFrame.this.selectedBook = null;
 						}
-					});
+					}, "Removing old copy");
 				}
 			}
 		});
@@ -381,11 +631,6 @@ class LocalReaderFrame extends JFrame {
 						public void run() {
 							reader.delete(selectedBook.getMeta().getLuid());
 							selectedBook = null;
-							SwingUtilities.invokeLater(new Runnable() {
-								public void run() {
-									refreshBooks(type);
-								}
-							});
 						}
 					});
 				}
@@ -450,31 +695,32 @@ class LocalReaderFrame extends JFrame {
 	 * @param run
 	 *            the action to run
 	 */
-	private void outOfUi(final Progress pg, final Runnable run) {
-		pgBar.setProgress(pg);
+	private void outOfUi(Progress progress, final Runnable run) {
+		final Progress pg = new Progress();
+		final Progress reload = new Progress("Reload books");
+		if (progress == null) {
+			progress = new Progress();
+		}
+
+		pg.addProgress(progress, 90);
+		pg.addProgress(reload, 10);
 
+		invalidate();
+		pgBar.setProgress(pg);
+		validate();
 		setEnabled(false);
-		pgBar.addActioListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				pgBar.setProgress(null);
-				setEnabled(true);
-			}
-		});
 
 		new Thread(new Runnable() {
 			public void run() {
 				run.run();
-				if (pg == null) {
-					SwingUtilities.invokeLater(new Runnable() {
-						public void run() {
-							setEnabled(true);
-						}
-					});
-				} else if (!pg.isDone()) {
-					pg.setProgress(pg.getMax());
+				refreshBooks();
+				reload.done();
+				if (!pg.isDone()) {
+					// will trigger pgBar ActionListener:
+					pg.done();
 				}
 			}
-		}).start();
+		}, "outOfUi thread").start();
 	}
 
 	/**
@@ -513,7 +759,7 @@ class LocalReaderFrame extends JFrame {
 		}
 
 		if (url != null && !url.toString().isEmpty()) {
-			imprt(url.toString(), null);
+			imprt(url.toString(), null, null);
 		}
 	}
 
@@ -527,13 +773,20 @@ class LocalReaderFrame extends JFrame {
 	 * @param onSuccess
 	 *            Action to execute on success
 	 */
-	private void imprt(final String url, final Runnable onSuccess) {
-		final Progress pg = new Progress("Importing " + url);
+	private void imprt(final String url, final Runnable onSuccess,
+			String onSuccessPgName) {
+		final Progress pg = new Progress();
+		final Progress pgImprt = new Progress();
+		final Progress pgOnSuccess = new Progress(onSuccessPgName);
+		pg.addProgress(pgImprt, 95);
+		pg.addProgress(pgOnSuccess, 5);
+
 		outOfUi(pg, new Runnable() {
 			public void run() {
 				Exception ex = null;
 				try {
-					Instance.getLibrary().imprt(BasicReader.getUrl(url), pg);
+					Instance.getLibrary().imprt(BasicReader.getUrl(url),
+							pgImprt);
 				} catch (IOException e) {
 					ex = e;
 				}
@@ -541,25 +794,24 @@ class LocalReaderFrame extends JFrame {
 				final Exception e = ex;
 
 				final boolean ok = (e == null);
-				SwingUtilities.invokeLater(new Runnable() {
-					public void run() {
-						if (!ok) {
-							Instance.syserr(e);
+
+				pgOnSuccess.setProgress(0);
+				if (!ok) {
+					Instance.syserr(e);
+					SwingUtilities.invokeLater(new Runnable() {
+						public void run() {
 							JOptionPane.showMessageDialog(
 									LocalReaderFrame.this, "Cannot import: "
 											+ url, e.getMessage(),
 									JOptionPane.ERROR_MESSAGE);
-
-							setEnabled(true);
-						} else {
-							refreshBooks(type);
-							if (onSuccess != null) {
-								onSuccess.run();
-								refreshBooks(type);
-							}
 						}
+					});
+				} else {
+					if (onSuccess != null) {
+						onSuccess.run();
 					}
-				});
+				}
+				pgOnSuccess.done();
 			}
 		});
 	}
@@ -577,15 +829,16 @@ class LocalReaderFrame extends JFrame {
 	 */
 	@Override
 	public void setEnabled(boolean b) {
-		for (LocalReaderBook book : books) {
-			book.setEnabled(b);
-			book.repaint();
+		if (bar != null) {
+			bar.setEnabled(b);
 		}
 
-		bar.setEnabled(b);
-		bookPane.setEnabled(b);
-		bookPane.repaint();
-
+		for (LocalReaderGroup group : booksByType.keySet()) {
+			group.setEnabled(b);
+		}
+		for (LocalReaderGroup group : booksByAuthor.keySet()) {
+			group.setEnabled(b);
+		}
 		super.setEnabled(b);
 		repaint();
 	}