Instance: use getInstance()

[nikiroo-utils.git] / src / be / nikiroo / fanfix / reader / ui / GuiReader.java

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 6c3a35e5198827c603393f4c5c77d5bea9f3b6d9..a02cc84f558892bfa4f055db720cda8db8c21097 100644 (file)
--- 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;
                                                }
@@ -219,21 +221,61 @@ class GuiReader extends BasicReader {
                }
        }
 
+       @Override
+       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) {
-               // TODO
+               GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+               search.search(searchOn, keywords, page, item);
                if (sync) {
-                       throw new java.lang.IllegalStateException("Not implemented yet.");
+                       sync(search);
+               } else {
+                       search.setVisible(true);
                }
        }
 
        @Override
-       public void searchTag(SupportType searchOn, int page, int item,
-                       boolean sync, Integer... tags) {
-               // TODO
+       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) {
-                       throw new java.lang.IllegalStateException("Not implemented yet.");
+                       action.run();
+               } else {
+                       new Thread(action).start();
                }
        }
 
@@ -251,7 +293,7 @@ class GuiReader extends BasicReader {
                try {
                        cacheLib.clearFromCache(luid);
                } catch (IOException e) {
-                       Instance.getTraceHandler().error(e);
+                       Instance.getInstance().getTraceHandler().error(e);
                }
        }
 
@@ -268,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.
-        * <p>
-        * Asynchronous method.
         * 
         * @param luid
         *            the luid of the {@link Story} to open
@@ -293,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) {
@@ -320,6 +360,24 @@ class GuiReader extends BasicReader {
                }
        }
 
+
+       /**
+        * "Prefetch" the given {@link Story}.
+        * <p>
+        * 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).
@@ -337,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);
                }
        }
 
@@ -353,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);
                }
        }
 
@@ -371,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);
                }
        }
 
@@ -384,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);
        }
 
        /**
@@ -426,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;
                }