git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TUI: update (most menu functions working)
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
CliReader.java
diff --git
a/src/be/nikiroo/fanfix/reader/CliReader.java
b/src/be/nikiroo/fanfix/reader/CliReader.java
index b3dd3edc79300b28c2ea779c91c887bbbbd9d704..2f0b8cee32910ffae7e31374b807a3cd2d65f32c 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/CliReader.java
+++ b/
src/be/nikiroo/fanfix/reader/CliReader.java
@@
-9,7
+9,6
@@
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Paragraph;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Paragraph;
import be.nikiroo.fanfix.data.Story;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
/**
* Command line {@link Story} reader.
/**
* Command line {@link Story} reader.
@@
-21,24
+20,23
@@
import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
class CliReader extends BasicReader {
@Override
public void read() throws IOException {
class CliReader extends BasicReader {
@Override
public void read() throws IOException {
- if (getStory() == null) {
+ MetaData meta = getMeta();
+
+ if (meta == null) {
throw new IOException("No story to read");
}
String title = "";
String author = "";
throw new IOException("No story to read");
}
String title = "";
String author = "";
- MetaData meta = getStory().getMeta();
- if (meta != null) {
- if (meta.getTitle() != null) {
- title = meta.getTitle();
- }
+ if (meta.getTitle() != null) {
+ title = meta.getTitle();
+ }
- if (meta.getAuthor() != null) {
- author = "©" + meta.getAuthor();
- if (meta.getDate() != null && !meta.getDate().isEmpty()) {
- author = author + " (" + meta.getDate() + ")";
- }
+ if (meta.getAuthor() != null) {
+ author = "©" + meta.getAuthor();
+ if (meta.getDate() != null && !meta.getDate().isEmpty()) {
+ author = author + " (" + meta.getDate() + ")";
}
}
}
}
@@
-46,7
+44,8
@@
class CliReader extends BasicReader {
System.out.println(author);
System.out.println("");
System.out.println(author);
System.out.println("");
- for (Chapter chap : getStory()) {
+ // 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(),
if (chap.getName() != null && !chap.getName().isEmpty()) {
System.out.println(Instance.getTrans().getString(
StringId.CHAPTER_NAMED, chap.getNumber(),
@@
-58,12
+57,18
@@
class CliReader extends BasicReader {
}
}
}
}
- @Override
- public void read(int chapter) {
- if (chapter > getStory().getChapters().size()) {
+ public void read(int chapter) throws IOException {
+ MetaData meta = getMeta();
+
+ if (meta == null) {
+ throw new IOException("No story to read");
+ }
+
+ // TODO: progress?
+ if (chapter > getStory(null).getChapters().size()) {
System.err.println("Chapter " + chapter + ": no such chapter");
} else {
System.err.println("Chapter " + chapter + ": no such chapter");
} else {
- Chapter chap = getStory().getChapters().get(chapter - 1);
+ Chapter chap = getStory(
null
).getChapters().get(chapter - 1);
System.out.println("Chapter " + chap.getNumber() + ": "
+ chap.getName());
System.out.println("Chapter " + chap.getNumber() + ": "
+ chap.getName());
@@
-75,9
+80,9
@@
class CliReader extends BasicReader {
}
@Override
}
@Override
- public void
start(SupportType typ
e) {
+ public void
browse(String sourc
e) {
List<MetaData> stories;
List<MetaData> stories;
- stories =
Instance.getLibrary().getList(typ
e);
+ stories =
getLibrary().getListBySource(sourc
e);
for (MetaData story : stories) {
String author = "";
for (MetaData story : stories) {
String author = "";