X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=a02cc84f558892bfa4f055db720cda8db8c21097;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=2ca61919cc5adb1aa714f3618e38e7b7f3f85bfb;hpb=6be5e3bb218e1ed118ad5e693e13d1da2b49df13;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 2ca6191..a02cc84 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -25,6 +25,8 @@ import be.nikiroo.fanfix.library.BasicLibrary;
import be.nikiroo.fanfix.library.CacheLibrary;
import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.reader.Reader;
+import be.nikiroo.fanfix.searchable.BasicSearchable;
+import be.nikiroo.fanfix.searchable.SearchableTag;
import be.nikiroo.fanfix.supported.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
@@ -61,7 +63,7 @@ class GuiReader extends BasicReader {
nativeLookLoaded = true;
}
- cacheDir = Instance.getReaderDir();
+ cacheDir = Instance.getInstance().getReaderDir();
cacheDir.mkdirs();
if (!cacheDir.exists()) {
throw new IOException(
@@ -77,7 +79,7 @@ class GuiReader extends BasicReader {
if (lib instanceof CacheLibrary) {
cacheLib = (CacheLibrary) lib;
} else {
- cacheLib = new CacheLibrary(cacheDir, lib);
+ cacheLib = new CacheLibrary(cacheDir, lib, Instance.getInstance().getUiConfig());
}
}
@@ -148,9 +150,9 @@ class GuiReader extends BasicReader {
try {
Desktop.getDesktop().browse(e.getURL().toURI());
} catch (IOException ee) {
- Instance.getTraceHandler().error(ee);
+ Instance.getInstance().getTraceHandler().error(ee);
} catch (URISyntaxException ee) {
- Instance.getTraceHandler().error(ee);
+ Instance.getInstance().getTraceHandler().error(ee);
}
}
});
@@ -182,7 +184,7 @@ class GuiReader extends BasicReader {
GuiReader.this, typeFinal);
sync(gui);
} catch (Exception e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
} finally {
done[0] = true;
}
@@ -218,17 +220,63 @@ class GuiReader extends BasicReader {
super.start(target, program, sync);
}
}
-
+
@Override
- public void search(SupportType searchOn, String keywords, int page, int item) {
- // TODO: !!!
- throw new java.lang.IllegalStateException("Not implemented yet.");
+ public void search(boolean sync) throws IOException {
+ GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+ if (sync) {
+ sync(search);
+ } else {
+ search.setVisible(true);
+ }
}
-
+
+ @Override
+ public void search(SupportType searchOn, String keywords, int page,
+ int item, boolean sync) {
+ GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+ search.search(searchOn, keywords, page, item);
+ if (sync) {
+ sync(search);
+ } else {
+ search.setVisible(true);
+ }
+ }
+
@Override
- public void searchTag(SupportType searchOn, int page, int item, String... tags) {
- // TODO: !!!
- throw new java.lang.IllegalStateException("Not implemented yet.");
+ public void searchTag(final SupportType searchOn, final int page,
+ final int item, final boolean sync, final Integer... tags) {
+
+ final GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+
+ final BasicSearchable searchable = BasicSearchable
+ .getSearchable(searchOn);
+
+ Runnable action = new Runnable() {
+ @Override
+ public void run() {
+ SearchableTag tag = null;
+ try {
+ tag = searchable.getTag(tags);
+ } catch (IOException e) {
+ Instance.getInstance().getTraceHandler().error(e);
+ }
+
+ search.searchTag(searchOn, page, item, tag);
+
+ if (sync) {
+ sync(search);
+ } else {
+ search.setVisible(true);
+ }
+ }
+ };
+
+ if (sync) {
+ action.run();
+ } else {
+ new Thread(action).start();
+ }
}
/**
@@ -245,7 +293,7 @@ class GuiReader extends BasicReader {
try {
cacheLib.clearFromCache(luid);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
}
}
@@ -262,15 +310,13 @@ class GuiReader extends BasicReader {
try {
cacheLib.delete(luid);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
}
}
/**
* "Open" the given {@link Story}. It usually involves starting an external
* program adapted to the given file type.
- *
- * Asynchronous method.
*
* @param luid
* the luid of the {@link Story} to open
@@ -287,10 +333,10 @@ class GuiReader extends BasicReader {
void read(String luid, boolean sync, Progress pg) throws IOException {
MetaData meta = cacheLib.getInfo(luid);
- boolean textInternal = Instance.getUiConfig().getBoolean(
- UiConfig.NON_IMAGES_DOCUMENT_USE_INTERNAL_READER, true);
- boolean imageInternal = Instance.getUiConfig().getBoolean(
- UiConfig.IMAGES_DOCUMENT_USE_INTERNAL_READER, true);
+ boolean textInternal = Instance.getInstance().getUiConfig()
+ .getBoolean(UiConfig.NON_IMAGES_DOCUMENT_USE_INTERNAL_READER, true);
+ boolean imageInternal = Instance.getInstance().getUiConfig()
+ .getBoolean(UiConfig.IMAGES_DOCUMENT_USE_INTERNAL_READER, true);
boolean useInternalViewer = true;
if (meta.isImageDocument() && !imageInternal) {
@@ -314,6 +360,24 @@ class GuiReader extends BasicReader {
}
}
+
+ /**
+ * "Prefetch" the given {@link Story}.
+ *
+ * Synchronous method.
+ *
+ * @param luid
+ * the luid of the {@link Story} to prefetch
+ * @param pg
+ * the optional progress (we may need to prepare the
+ * {@link Story} for reading
+ *
+ * @throws IOException
+ * in case of I/O errors
+ */
+ void prefetch(String luid, Progress pg) throws IOException {
+ cacheLib.getFile(luid, pg);
+ }
/**
* Change the source of the given {@link Story} (the source is the main
* information used to group the stories together).
@@ -331,7 +395,7 @@ class GuiReader extends BasicReader {
try {
cacheLib.changeSource(luid, newSource, null);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
}
}
@@ -347,7 +411,7 @@ class GuiReader extends BasicReader {
try {
cacheLib.changeTitle(luid, newTitle, null);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
}
}
@@ -365,7 +429,7 @@ class GuiReader extends BasicReader {
try {
cacheLib.changeAuthor(luid, newAuthor, null);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
}
}
@@ -378,7 +442,7 @@ class GuiReader extends BasicReader {
* @return the translated result
*/
static String trans(StringIdGui id, Object... params) {
- return Instance.getTransGui().getString(id, params);
+ return Instance.getInstance().getTransGui().getString(id, params);
}
/**
@@ -420,7 +484,7 @@ class GuiReader extends BasicReader {
EventQueue.invokeLater(run);
}
} catch (Exception e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
done[0] = true;
}