Instance: use getInstance()

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

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index e0970e3ef09621e9f8c582d65fb7e4a2c2afba13..7f79da3a8ec62b854b7bcdba62838a23779fcaf4 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -30,7 +30,7 @@ import be.nikiroo.utils.serial.SerialUtils;
  * @author niki
  */
 public abstract class BasicReader implements Reader {
-       private static BasicLibrary defaultLibrary = Instance.getLibrary();
+       private static BasicLibrary defaultLibrary = Instance.getInstance().getLibrary();
        private static ReaderType defaultType = ReaderType.GUI;
 
        private BasicLibrary lib;
@@ -42,7 +42,7 @@ public abstract class BasicReader implements Reader {
         * Take the default reader type configuration from the config file.
         */
        static {
-               String typeString = Instance.getConfig().getString(Config.READER_TYPE);
+               String typeString = Instance.getInstance().getConfig().getString(Config.READER_TYPE);
                if (typeString != null && !typeString.isEmpty()) {
                        try {
                                ReaderType type = ReaderType.valueOf(typeString.toUpperCase());
@@ -54,7 +54,7 @@ public abstract class BasicReader implements Reader {
        }
 
        @Override
-       public synchronized Story getStory(Progress pg) {
+       public synchronized Story getStory(Progress pg) throws IOException {
                if (story == null) {
                        story = getLibrary().getStory(meta.getLuid(), pg);
                }
@@ -137,9 +137,8 @@ public abstract class BasicReader implements Reader {
                                                .getTypeName());
                        }
                } catch (Exception e) {
-                       Instance.getTraceHandler().error(
-                                       new Exception("Cannot create a reader of type: "
-                                                       + defaultType + " (Not compiled in?)", e));
+                       Instance.getInstance().getTraceHandler()
+                                       .error(new Exception("Cannot create a reader of type: " + defaultType + " (Not compiled in?)", e));
                }
 
                return null;
@@ -227,16 +226,19 @@ public abstract class BasicReader implements Reader {
                        tags.append(tag);
                }
 
+               // TODO: i18n
                metaDesc.put("Author", meta.getAuthor());
                metaDesc.put("Publication date", formatDate(meta.getDate()));
                metaDesc.put("Published on", meta.getPublisher());
                metaDesc.put("URL", meta.getUrl());
+               String count = "";
+               if (meta.getWords() > 0) {
+                       count = StringUtils.formatNumber(meta.getWords());
+               }
                if (meta.isImageDocument()) {
-                       metaDesc.put("Number of images",
-                                       StringUtils.formatNumber(meta.getWords()));
+                       metaDesc.put("Number of images", count);
                } else {
-                       metaDesc.put("Number of words",
-                                       StringUtils.formatNumber(meta.getWords()));
+                       metaDesc.put("Number of words", count);
                }
                metaDesc.put("Source", meta.getSource());
                metaDesc.put("Subject", meta.getSubject());
@@ -289,11 +291,9 @@ public abstract class BasicReader implements Reader {
                        throws IOException {
                String program = null;
                if (meta.isImageDocument()) {
-                       program = Instance.getUiConfig().getString(
-                                       UiConfig.IMAGES_DOCUMENT_READER);
+                       program = Instance.getInstance().getUiConfig().getString(UiConfig.IMAGES_DOCUMENT_READER);
                } else {
-                       program = Instance.getUiConfig().getString(
-                                       UiConfig.NON_IMAGES_DOCUMENT_READER);
+                       program = Instance.getInstance().getUiConfig().getString(UiConfig.NON_IMAGES_DOCUMENT_READER);
                }
 
                if (program != null && program.trim().isEmpty()) {
@@ -327,10 +327,8 @@ public abstract class BasicReader implements Reader {
                        for (String starter : new String[] { "xdg-open", "open", "see",
                                        "start", "run" }) {
                                try {
-                                       Instance.getTraceHandler().trace(
-                                                       "starting external program");
-                                       proc = Runtime.getRuntime().exec(
-                                                       new String[] { starter, target.getAbsolutePath() });
+                                       Instance.getInstance().getTraceHandler().trace("starting external program");
+                                       proc = Runtime.getRuntime().exec(new String[] { starter, target.getAbsolutePath() });
                                        ok = true;
                                        break;
                                } catch (IOException e) {
@@ -340,7 +338,7 @@ public abstract class BasicReader implements Reader {
                                throw new IOException("Cannot find a program to start the file");
                        }
                } else {
-                       Instance.getTraceHandler().trace("starting external program");
+                       Instance.getInstance().getTraceHandler().trace("starting external program");
                        proc = Runtime.getRuntime().exec(
                                        new String[] { program, target.getAbsolutePath() });
                }
@@ -356,23 +354,29 @@ public abstract class BasicReader implements Reader {
        static private String formatDate(String date) {
                long ms = 0;
 
-               try {
-                       ms = StringUtils.toTime(date);
-               } catch (ParseException e) {
-               }
-
-               if (ms <= 0) {
-                       SimpleDateFormat sdf = new SimpleDateFormat(
-                                       "yyyy-MM-dd'T'HH:mm:ssSSS");
+               if (date != null && !date.isEmpty()) {
                        try {
-                               ms = sdf.parse(date).getTime();
+                               ms = StringUtils.toTime(date);
                        } catch (ParseException e) {
                        }
+
+                       if (ms <= 0) {
+                               SimpleDateFormat sdf = new SimpleDateFormat(
+                                               "yyyy-MM-dd'T'HH:mm:ssSSS");
+                               try {
+                                       ms = sdf.parse(date).getTime();
+                               } catch (ParseException e) {
+                               }
+                       }
+
+                       if (ms > 0) {
+                               SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                               return sdf.format(new Date(ms));
+                       }
                }
 
-               if (ms > 0) {
-                       SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                       return sdf.format(new Date(ms));
+               if (date == null) {
+                       date = "";
                }
 
                // :(