X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderMainPanel.java;h=a5eb6916f5972b281d7b7237a3464e2f50ee7c55;hb=1387a30ab59dbf4071f2c5e5e0e08ca98c75b726;hp=7caa243c411ca4bba0f4bf2c0dbbedd7368f8e07;hpb=b6b657954954280c9ab0efcec67f3fe4a3ae0945;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
index 7caa243..a5eb691 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
@@ -17,6 +17,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -42,6 +43,7 @@ import be.nikiroo.fanfix.library.BasicLibrary.Status;
 import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.reader.BasicReader;
 import be.nikiroo.fanfix.reader.ui.GuiReaderBook.BookActionListener;
+import be.nikiroo.fanfix.reader.ui.GuiReaderBookInfo.Type;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.ui.ProgressBar;
 
@@ -140,8 +142,7 @@ class GuiReaderMainPanel extends JPanel {
 		pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
 		JScrollPane scroll = new JScrollPane(pane);
 
-		Integer icolor = Instance.getUiConfig().getColor(
-				UiConfig.BACKGROUND_COLOR);
+		Integer icolor = Instance.getInstance().getUiConfig().getColor(UiConfig.BACKGROUND_COLOR);
 		if (icolor != null) {
 			color = new Color(icolor);
 			setBackground(color);
@@ -222,8 +223,7 @@ class GuiReaderMainPanel extends JPanel {
 							helper.createMenu(status);
 							validate();
 
-							String desc = Instance.getTransGui().getStringX(
-									StringIdGui.ERROR_LIB_STATUS,
+							String desc = Instance.getInstance().getTransGui().getStringX(StringIdGui.ERROR_LIB_STATUS,
 									status.toString());
 							if (desc == null) {
 								desc = GuiReader
@@ -363,9 +363,9 @@ class GuiReaderMainPanel extends JPanel {
 			List<MetaData> metas;
 			try {
 				if (currentType) {
-					metas = lib.getListBySource(value);
+					metas = lib.getList().filter(value, null, null);
 				} else {
-					metas = lib.getListByAuthor(value);
+					metas = lib.getList().filter(null, value, null);
 				}
 			} catch (IOException e) {
 				error(e.getLocalizedMessage(), "IOException", e);
@@ -407,7 +407,71 @@ class GuiReaderMainPanel extends JPanel {
 						}
 					});
 				} catch (IOException e) {
-					Instance.getTraceHandler().error(e);
+					Instance.getInstance().getTraceHandler().error(e);
+					error(GuiReader.trans(StringIdGui.ERROR_CANNOT_OPEN),
+							GuiReader.trans(StringIdGui.TITLE_ERROR), e);
+				}
+			}
+		});
+	}
+	
+	/**
+	 * Prefetch a {@link GuiReaderBook} item (which can be a group, in which
+	 * case we prefetch all its members).
+	 * 
+	 * @param book
+	 *            the {@link GuiReaderBook} to open
+	 */
+	public void prefetchBook(final GuiReaderBook book) {
+		final List<String> luids = new LinkedList<String>();
+		try {
+			switch (book.getInfo().getType()) {
+			case STORY:
+				luids.add(book.getInfo().getMeta().getLuid());
+				break;
+			case SOURCE:
+				for (MetaData meta : helper.getReader().getLibrary()
+						.getList().filter(book.getInfo().getMainInfo(), null, null)) {
+					luids.add(meta.getLuid());
+				}
+				break;
+			case AUTHOR:
+				for (MetaData meta : helper.getReader().getLibrary()
+						.getList().filter(null, book.getInfo().getMainInfo(), null)) {
+					luids.add(meta.getLuid());
+				}
+				break;
+			}
+		} catch (IOException e) {
+			Instance.getInstance().getTraceHandler().error(e);
+		}
+
+		final Progress pg = new Progress();
+		pg.setMax(luids.size());
+
+		outOfUi(pg, false, new Runnable() {
+			@Override
+			public void run() {
+				try {
+					for (String luid : luids) {
+						Progress pgStep = new Progress();
+						pg.addProgress(pgStep, 1);
+
+						helper.getReader().prefetch(luid, pgStep);
+					}
+
+					// TODO: also set the green button on sources/authors?
+					// requires to do the same when all stories inside are green
+					if (book.getInfo().getType() == Type.STORY) {
+						SwingUtilities.invokeLater(new Runnable() {
+							@Override
+							public void run() {
+								book.setCached(true);
+							}
+						});
+					}
+				} catch (IOException e) {
+					Instance.getInstance().getTraceHandler().error(e);
 					error(GuiReader.trans(StringIdGui.ERROR_CANNOT_OPEN),
 							GuiReader.trans(StringIdGui.TITLE_ERROR), e);
 				}
@@ -488,9 +552,9 @@ class GuiReaderMainPanel extends JPanel {
 			try {
 				EventQueue.invokeAndWait(run);
 			} catch (InterruptedException e) {
-				Instance.getTraceHandler().error(e);
+				Instance.getInstance().getTraceHandler().error(e);
 			} catch (InvocationTargetException e) {
-				Instance.getTraceHandler().error(e);
+				Instance.getInstance().getTraceHandler().error(e);
 			}
 		}
 	}
@@ -517,7 +581,8 @@ class GuiReaderMainPanel extends JPanel {
 				// No data will be handled
 			}
 
-			if (clipboard == null || !clipboard.startsWith("http")) {
+			if (clipboard == null || !(clipboard.startsWith("http://") || //
+					clipboard.startsWith("https://"))) {
 				clipboard = "";
 			}
 
@@ -709,9 +774,9 @@ class GuiReaderMainPanel extends JPanel {
 	 *            the exception to log if any
 	 */
 	private void error(final String message, final String title, Exception e) {
-		Instance.getTraceHandler().error(title + ": " + message);
+		Instance.getInstance().getTraceHandler().error(title + ": " + message);
 		if (e != null) {
-			Instance.getTraceHandler().error(e);
+			Instance.getInstance().getTraceHandler().error(e);
 		}
 
 		SwingUtilities.invokeLater(new Runnable() {