X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fcli%2FCliReader.java;h=556052149d7c120305df7ab206e10b80618af703;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=33578be668818e9974d26db122e29cbe1904cafe;hpb=b31a0db030e164bc1d9a8620e71b595dad31adb6;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/reader/cli/CliReader.java b/src/be/nikiroo/fanfix/reader/cli/CliReader.java index 33578be..5560521 100644 --- 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 stories; - stories = getLibrary().getListBySource(source); + public void browse(String source) throws IOException { + List stories = getLibrary().getListBySource(source); for (MetaData story : stories) { String author = ""; @@ -153,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()); }