Instance: use getInstance()

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

diff --git a/src/be/nikiroo/fanfix/reader/cli/CliReader.java b/src/be/nikiroo/fanfix/reader/cli/CliReader.java
index 3795cd8800a526cf28efe8efd0dc450974ff9029..556052149d7c120305df7ab206e10b80618af703 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/cli/CliReader.java
+++ b/src/be/nikiroo/fanfix/reader/cli/CliReader.java
@@ -52,12 +52,11 @@ class CliReader extends BasicReader {
                // TODO: progress?
                for (Chapter chap : getStory(null)) {
                        if (chap.getName() != null && !chap.getName().isEmpty()) {
-                               System.out.println(Instance.getTrans().getString(
-                                               StringId.CHAPTER_NAMED, chap.getNumber(),
+                               System.out.println(Instance.getInstance().getTrans().getString(StringId.CHAPTER_NAMED, chap.getNumber(),
                                                chap.getName()));
                        } else {
-                               System.out.println(Instance.getTrans().getString(
-                                               StringId.CHAPTER_UNNAMED, chap.getNumber()));
+                               System.out.println(
+                                               Instance.getInstance().getTrans().getString(StringId.CHAPTER_UNNAMED, chap.getNumber()));
                        }
                }
        }
@@ -85,9 +84,8 @@ class CliReader extends BasicReader {
        }
 
        @Override
-       public void browse(String source) {
-               List<MetaData> stories;
-               stories = getLibrary().getListBySource(source);
+       public void browse(String source) throws IOException {
+               List<MetaData> stories = getLibrary().getListBySource(source);
 
                for (MetaData story : stories) {
                        String author = "";
@@ -100,6 +98,15 @@ class CliReader extends BasicReader {
                }
        }
 
+       @Override
+       public void search(boolean sync) throws IOException {
+               for (SupportType type : SupportType.values()) {
+                       if (BasicSearchable.getSearchable(type) != null) {
+                               System.out.println(type);
+                       }
+               }
+       }
+
        @Override
        public void search(SupportType searchOn, String keywords, int page,
                        int item, boolean sync) throws IOException {
@@ -116,7 +123,7 @@ class CliReader extends BasicReader {
                                displayStories(metas);
                        } else {
                                // ! 1-based index !
-                               if (item <= 0 | item > metas.size()) {
+                               if (item <= 0 || item > metas.size()) {
                                        throw new IOException("Index out of bounds: " + item);
                                }
 
@@ -144,8 +151,7 @@ class CliReader extends BasicReader {
                } else {
                        if (page <= 0) {
                                if (stag.isLeaf()) {
-                                       search.search(stag, 1);
-                                       System.out.println(stag.getPages());
+                                       System.out.println(search.searchPages(stag));
                                } else {
                                        System.out.println(stag.getCount());
                                }