Add a new TUI system based upon Jexer (WIP)

[fanfix.git] / src / be / nikiroo / fanfix / reader / LocalReader.java

diff --git a/src/be/nikiroo/fanfix/reader/LocalReader.java b/src/be/nikiroo/fanfix/reader/LocalReader.java
index a3fdcab7b67d90d9404f4b77f101a0fb2d4531df..2b92e721db959fc52aa46af7ebb7799daa4afec5 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/LocalReader.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReader.java
@@ -16,7 +16,6 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.Library;
 import be.nikiroo.fanfix.VersionCheck;
 import be.nikiroo.fanfix.bundles.UiConfig;
-import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.utils.Progress;
@@ -111,29 +110,6 @@ class LocalReader extends BasicReader {
                }
        }
 
-       /**
-        * Get the target file related to this {@link Story}.
-        * 
-        * @param luid
-        *            the LUID of the {@link Story}
-        * @param pg
-        *            the optional progress reporter
-        * 
-        * @return the target file
-        * 
-        * @throws IOException
-        *             in case of I/O error
-        */
-       public File getTarget(String luid, Progress pg) throws IOException {
-               File file = lib.getFile(luid);
-               if (file == null) {
-                       imprt(luid, pg);
-                       file = lib.getFile(luid);
-               }
-
-               return file;
-       }
-
        /**
         * Check if the {@link Story} denoted by this Library UID is present in the
         * {@link LocalReader} cache.
@@ -224,35 +200,13 @@ class LocalReader extends BasicReader {
 
        // open the given book
        void open(String luid, Progress pg) throws IOException {
-               MetaData meta = Instance.getLibrary().getInfo(luid);
-               File target = getTarget(luid, pg);
-
-               String program = null;
-               if (meta.isImageDocument()) {
-                       program = Instance.getUiConfig().getString(
-                                       UiConfig.IMAGES_DOCUMENT_READER);
-               } else {
-                       program = Instance.getUiConfig().getString(
-                                       UiConfig.NON_IMAGES_DOCUMENT_READER);
-               }
-
-               if (program != null && program.trim().isEmpty()) {
-                       program = null;
+               File file = lib.getFile(luid);
+               if (file == null) {
+                       imprt(luid, pg);
+                       file = lib.getFile(luid);
                }
 
-               if (program == null) {
-                       try {
-                               Desktop.getDesktop().browse(target.toURI());
-                       } catch (UnsupportedOperationException e) {
-                               Runtime.getRuntime().exec(
-                                               new String[] { "xdg-open", target.getAbsolutePath() });
-
-                       }
-               } else {
-                       Runtime.getRuntime().exec(
-                                       new String[] { program, target.getAbsolutePath() });
-
-               }
+               open(Instance.getLibrary().getInfo(luid), file);
        }
 
        void changeType(String luid, String newType) {