CLI search, step 1

[fanfix.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 55701b1ad7b727d94470c449c368569e2aac3c5f..2ca61919cc5adb1aa714f3618e38e7b7f3f85bfb 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -17,12 +17,15 @@ import javax.swing.event.HyperlinkListener;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.VersionCheck;
+import be.nikiroo.fanfix.bundles.StringIdGui;
+import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 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.supported.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
 import be.nikiroo.utils.ui.UIUtils;
@@ -107,17 +110,22 @@ class GuiReader extends BasicReader {
 
        @Override
        public void browse(String type) {
+               final Boolean[] done = new Boolean[] { false };
+
                // TODO: improve presentation of update message
                final VersionCheck updates = VersionCheck.check();
                StringBuilder builder = new StringBuilder();
 
                final JEditorPane updateMessage = new JEditorPane("text/html", "");
                if (updates.isNewVersionAvailable()) {
-                       builder.append("A new version of the program is available at <span style='color: blue;'>https://github.com/nikiroo/fanfix/releases</span>");
+                       builder.append(trans(StringIdGui.NEW_VERSION_AVAILABLE,
+                                       "<span style='color: blue;'>https://github.com/nikiroo/fanfix/releases</span>"));
                        builder.append("<br>");
                        builder.append("<br>");
                        for (Version v : updates.getNewer()) {
-                               builder.append("\t<b>Version " + v + "</b>");
+                               builder.append("\t<b>"
+                                               + trans(StringIdGui.NEW_VERSION_VERSION, v.toString())
+                                               + "</b>");
                                builder.append("<br>");
                                builder.append("<ul>");
                                for (String item : updates.getChanges().get(v)) {
@@ -156,7 +164,8 @@ class GuiReader extends BasicReader {
                        public void run() {
                                if (updates.isNewVersionAvailable()) {
                                        int rep = JOptionPane.showConfirmDialog(null,
-                                                       updateMessage, "Updates available",
+                                                       updateMessage,
+                                                       trans(StringIdGui.NEW_VERSION_TITLE),
                                                        JOptionPane.OK_CANCEL_OPTION);
                                        if (rep == JOptionPane.OK_OPTION) {
                                                updates.ok();
@@ -165,15 +174,31 @@ class GuiReader extends BasicReader {
                                        }
                                }
 
-                               try {
-                                       GuiReaderFrame gui = new GuiReaderFrame(GuiReader.this,
-                                                       typeFinal);
-                                       sync(gui);
-                               } catch (Exception e) {
-                                       Instance.getTraceHandler().error(e);
-                               }
+                               new Thread(new Runnable() {
+                                       @Override
+                                       public void run() {
+                                               try {
+                                                       GuiReaderFrame gui = new GuiReaderFrame(
+                                                                       GuiReader.this, typeFinal);
+                                                       sync(gui);
+                                               } catch (Exception e) {
+                                                       Instance.getTraceHandler().error(e);
+                                               } finally {
+                                                       done[0] = true;
+                                               }
+
+                                       }
+                               }).start();
                        }
                });
+
+               // This action must be synchronous, so wait until the frame is closed
+               while (!done[0]) {
+                       try {
+                               Thread.sleep(100);
+                       } catch (InterruptedException e) {
+                       }
+               }
        }
 
        @Override
@@ -193,6 +218,18 @@ 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.");
+       }
+       
+       @Override
+       public void searchTag(SupportType searchOn, int page, int item, String... tags) {
+               // TODO: !!!
+               throw new java.lang.IllegalStateException("Not implemented yet.");
+       }
 
        /**
         * Delete the {@link Story} from the cache if it is present, but <b>NOT</b>
@@ -248,12 +285,33 @@ class GuiReader extends BasicReader {
         *             in case of I/O errors
         */
        void read(String luid, boolean sync, Progress pg) throws IOException {
-               File file = cacheLib.getFile(luid, pg);
+               MetaData meta = cacheLib.getInfo(luid);
 
-               // TODO: show a special page for the chapter?
-               // We could also implement an internal viewer, both for image and
-               // non-image documents
-               openExternal(getLibrary().getInfo(luid), file, sync);
+               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 useInternalViewer = true;
+               if (meta.isImageDocument() && !imageInternal) {
+                       useInternalViewer = false;
+               }
+               if (!meta.isImageDocument() && !textInternal) {
+                       useInternalViewer = false;
+               }
+
+               if (useInternalViewer) {
+                       GuiReaderViewer viewer = new GuiReaderViewer(cacheLib,
+                                       cacheLib.getStory(luid, null));
+                       if (sync) {
+                               sync(viewer);
+                       } else {
+                               viewer.setVisible(true);
+                       }
+               } else {
+                       File file = cacheLib.getFile(luid, pg);
+                       openExternal(meta, file, sync);
+               }
        }
 
        /**
@@ -311,6 +369,18 @@ class GuiReader extends BasicReader {
                }
        }
 
+       /**
+        * Simple shortcut method to call {link Instance#getTransGui()#getString()}.
+        * 
+        * @param id
+        *            the ID to translate
+        * 
+        * @return the translated result
+        */
+       static String trans(StringIdGui id, Object... params) {
+               return Instance.getTransGui().getString(id, params);
+       }
+
        /**
         * Start a frame and wait until it is closed before returning.
         * 
@@ -318,11 +388,14 @@ class GuiReader extends BasicReader {
         *            the frame to start
         */
        static private void sync(final JFrame frame) {
-               final Boolean[] done = new Boolean[1];
-               done[0] = false;
+               if (EventQueue.isDispatchThread()) {
+                       throw new IllegalStateException(
+                                       "Cannot call a sync method in the dispatch thread");
+               }
 
+               final Boolean[] done = new Boolean[] { false };
                try {
-                       EventQueue.invokeLater(new Runnable() {
+                       Runnable run = new Runnable() {
                                @Override
                                public void run() {
                                        try {
@@ -339,7 +412,13 @@ class GuiReader extends BasicReader {
                                                done[0] = true;
                                        }
                                }
-                       });
+                       };
+
+                       if (EventQueue.isDispatchThread()) {
+                               run.run();
+                       } else {
+                               EventQueue.invokeLater(run);
+                       }
                } catch (Exception e) {
                        Instance.getTraceHandler().error(e);
                        done[0] = true;