X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderMainWindow.java;h=2ee319ab678b2f5c8b60c0edb2552ec0f88b4ff4;hb=1387a30ab59dbf4071f2c5e5e0e08ca98c75b726;hp=cbca857d01fc79770bfb04de9b35b96f1b224878;hpb=0bcb5c7ff5300deb01c5136cf0d26d65d9455100;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
index cbca857..2ee319a 100644
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
@@ -22,7 +22,6 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.library.BasicLibrary;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
-import be.nikiroo.fanfix.reader.Reader;
 import be.nikiroo.jexer.TSizeConstraint;
 
 /**
@@ -43,7 +42,7 @@ class TuiReaderMainWindow extends TWindow {
 	private TList list;
 	private List<MetaData> listKeys;
 	private List<String> listItems;
-	private Reader reader;
+	private TuiReaderApplication reader;
 
 	private Mode mode = Mode.SOURCE;
 	private String target = null;
@@ -160,15 +159,24 @@ class TuiReaderMainWindow extends TWindow {
 				} else if (smode.equals("Sources")) {
 					selectTargets.clear();
 					selectTargets.add("(show all)");
-					for (String source : reader.getLibrary().getSources()) {
-						selectTargets.add(source);
+					try {
+						for (String source : reader.getLibrary().getSources()) {
+							selectTargets.add(source);
+						}
+					} catch (IOException e) {
+						Instance.getInstance().getTraceHandler().error(e);
 					}
+
 					showTarget = true;
 				} else {
 					selectTargets.clear();
 					selectTargets.add("(show all)");
-					for (String author : reader.getLibrary().getAuthors()) {
-						selectTargets.add(author);
+					try {
+						for (String author : reader.getLibrary().getAuthors()) {
+							selectTargets.add(author);
+						}
+					} catch (IOException e) {
+						Instance.getInstance().getTraceHandler().error(e);
 					}
 
 					showTarget = true;
@@ -232,12 +240,18 @@ class TuiReaderMainWindow extends TWindow {
 	 */
 	public void refreshStories() {
 		List<MetaData> metas;
-		if (mode == Mode.SOURCE) {
-			metas = reader.getLibrary().getListBySource(target);
-		} else if (mode == Mode.AUTHOR) {
-			metas = reader.getLibrary().getListByAuthor(target);
-		} else {
-			metas = reader.getLibrary().getList();
+
+		try {
+			if (mode == Mode.SOURCE) {
+				metas = reader.getLibrary().getList().filter(target, null, null);
+			} else if (mode == Mode.AUTHOR) {
+				metas = reader.getLibrary().getList().filter(null, target, null);
+			} else {
+				metas = reader.getLibrary().getList().getMetas();
+			}
+		} catch (IOException e) {
+			Instance.getInstance().getTraceHandler().error(e);
+			metas = new ArrayList<MetaData>();
 		}
 
 		setMetas(metas);
@@ -300,9 +314,9 @@ class TuiReaderMainWindow extends TWindow {
 		try {
 			reader.setChapter(-1);
 			reader.setMeta(meta);
-			reader.read();
+			reader.read(false);
 		} catch (IOException e) {
-			Instance.getTraceHandler().error(e);
+			Instance.getInstance().getTraceHandler().error(e);
 		}
 	}
 
@@ -325,11 +339,11 @@ class TuiReaderMainWindow extends TWindow {
 		MetaData meta = getSelectedMeta();
 		if (meta != null) {
 			switch (menu.getId()) {
-			case TuiReaderApplication.MENU_OPEN:
+			case TuiReaderApplication.MENU_FILE_OPEN:
 				readStory(meta);
 
 				return;
-			case TuiReaderApplication.MENU_EXPORT:
+			case TuiReaderApplication.MENU_FILE_EXPORT:
 
 				try {
 					// TODO: choose type, pg, error