X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FText.java;h=25d7899a61ef1caf7f042053499b28dc87530fa3;hb=48f14dc96bd27521e0c36ca227f3f3a2df3e5213;hp=f7ecadad15f8217dd5d1a1c43887d056f2d383e1;hpb=2206ef66ee00ad42d806f04a7b7ad6f8cb2d8828;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java
index f7ecada..25d7899 100644
--- a/src/be/nikiroo/fanfix/supported/Text.java
+++ b/src/be/nikiroo/fanfix/supported/Text.java
@@ -1,6 +1,5 @@
package be.nikiroo.fanfix.supported;
-import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -14,6 +13,8 @@ import java.util.Scanner;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.utils.Image;
+import be.nikiroo.utils.Progress;
/**
* Support class for local stories encoded in textual format, with a few rules:
@@ -27,12 +28,12 @@ import be.nikiroo.fanfix.data.MetaData;
* number
*
A description of the story must be given as chapter number 0
* A cover may be present, with the same filename but a PNG, JPEG or JPG
- * extension
*
*
* @author niki
*/
-class Text extends BasicSupport {
+class Text extends BasicSupport_Deprecated {
@Override
protected boolean isHtml() {
return false;
@@ -56,7 +57,7 @@ class Text extends BasicSupport {
meta.setPublisher("");
meta.setUuid(source.toString());
meta.setLuid("");
- meta.setLang(getLang(source, reset(in))); // default is EN
+ meta.setLang(getLang(reset(in))); // default is EN
meta.setSubject(getSubject(source));
meta.setType(getType().toString());
meta.setImageDocument(false);
@@ -76,7 +77,7 @@ class Text extends BasicSupport {
}
- private String getLang(URL source, InputStream in) throws IOException {
+ private String getLang(InputStream in) {
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@@ -87,7 +88,12 @@ class Text extends BasicSupport {
chapter0 = scan.next();
}
- String lang = detectChapter(chapter0);
+ String lang = detectChapter(chapter0, 0);
+ if (lang == null) {
+ // No description??
+ lang = detectChapter(chapter0, 1);
+ }
+
if (lang == null) {
lang = "EN";
} else {
@@ -97,14 +103,14 @@ class Text extends BasicSupport {
return lang;
}
- private String getTitle(InputStream in) throws IOException {
+ private String getTitle(InputStream in) {
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
return scan.next();
}
- private String getAuthor(InputStream in) throws IOException {
+ private String getAuthor(InputStream in) {
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@@ -117,10 +123,10 @@ class Text extends BasicSupport {
author = authorDate.substring(0, pos);
}
- return fixAuthor(author);
+ return BasicSupportHelper.fixAuthor(author);
}
- private String getDate(InputStream in) throws IOException {
+ private String getDate(InputStream in) {
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@@ -142,15 +148,15 @@ class Text extends BasicSupport {
@Override
protected String getDesc(URL source, InputStream in) throws IOException {
- return getChapterContent(source, in, 0);
+ return getChapterContent(source, in, 0, null);
}
- private BufferedImage getCover(URL source) throws IOException {
+ private Image getCover(URL source) {
String path;
try {
path = new File(source.toURI()).getPath();
} catch (URISyntaxException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
path = null;
}
@@ -160,45 +166,43 @@ class Text extends BasicSupport {
}
}
- return getImage(source, path);
+ return getImage(this, source, path);
}
@Override
- protected List> getChapters(URL source, InputStream in)
- throws IOException {
+ protected List> getChapters(URL source, InputStream in,
+ Progress pg) throws IOException {
List> chaps = new ArrayList>();
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
- boolean descSkipped = false;
boolean prevLineEmpty = false;
while (scan.hasNext()) {
String line = scan.next();
- if (prevLineEmpty && detectChapter(line) != null) {
- if (descSkipped) {
- String chapName = Integer.toString(chaps.size());
- int pos = line.indexOf(':');
- if (pos >= 0 && pos + 1 < line.length()) {
- chapName = line.substring(pos + 1).trim();
+ if (prevLineEmpty && detectChapter(line, chaps.size() + 1) != null) {
+ String chapName = Integer.toString(chaps.size() + 1);
+ int pos = line.indexOf(':');
+ if (pos >= 0 && pos + 1 < line.length()) {
+ chapName = line.substring(pos + 1).trim();
+ }
+ final URL value = source;
+ final String key = chapName;
+ chaps.add(new Entry() {
+ @Override
+ public URL setValue(URL value) {
+ return null;
}
- final URL value = source;
- final String key = chapName;
- chaps.add(new Entry() {
- public URL setValue(URL value) {
- return null;
- }
- public URL getValue() {
- return value;
- }
+ @Override
+ public URL getValue() {
+ return value;
+ }
- public String getKey() {
- return key;
- }
- });
- } else {
- descSkipped = true;
- }
+ @Override
+ public String getKey() {
+ return key;
+ }
+ });
}
prevLineEmpty = line.trim().isEmpty();
@@ -208,8 +212,8 @@ class Text extends BasicSupport {
}
@Override
- protected String getChapterContent(URL source, InputStream in, int number)
- throws IOException {
+ protected String getChapterContent(URL source, InputStream in, int number,
+ Progress pg) throws IOException {
StringBuilder builder = new StringBuilder();
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
@@ -219,7 +223,7 @@ class Text extends BasicSupport {
String line = scan.next();
if (detectChapter(line, number) != null) {
inChap = true;
- } else if (inChap && detectChapter(line) != null) {
+ } else if (inChap && detectChapter(line, number + 1) != null) {
break;
} else if (inChap) {
builder.append(line);
@@ -238,7 +242,7 @@ class Text extends BasicSupport {
file = new File(url.toURI());
file = new File(file.getPath() + ".info");
} catch (URISyntaxException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
file = null;
}
@@ -248,19 +252,6 @@ class Text extends BasicSupport {
return false;
}
- /**
- * Check if the given line looks like a starting chapter in a supported
- * language, and return the language if it does (or NULL if not).
- *
- * @param line
- * the line to check
- *
- * @return the language or NULL
- */
- private String detectChapter(String line) {
- return detectChapter(line, null);
- }
-
/**
* Check if the given line looks like the given starting chapter in a
* supported language, and return the language if it does (or NULL if not).
@@ -270,7 +261,7 @@ class Text extends BasicSupport {
*
* @return the language or NULL
*/
- private String detectChapter(String line, Integer number) {
+ private String detectChapter(String line, int number) {
line = line.toUpperCase();
for (String lang : Instance.getConfig().getString(Config.CHAPTER)
.split(",")) {
@@ -279,19 +270,16 @@ class Text extends BasicSupport {
if (chapter != null && !chapter.isEmpty()) {
chapter = chapter.toUpperCase() + " ";
if (line.startsWith(chapter)) {
- if (number != null) {
- // We want "[CHAPTER] [number]: [name]", with ": [name]"
- // optional
- String test = line.substring(chapter.length()).trim();
- if (test.startsWith(Integer.toString(number))) {
- test = test.substring(
- Integer.toString(number).length()).trim();
- if (test.isEmpty() || test.startsWith(":")) {
- return lang;
- }
+ // We want "[CHAPTER] [number]: [name]", with ": [name]"
+ // optional
+ String test = line.substring(chapter.length()).trim();
+ if (test.startsWith(Integer.toString(number))) {
+ test = test
+ .substring(Integer.toString(number).length())
+ .trim();
+ if (test.isEmpty() || test.startsWith(":")) {
+ return lang;
}
- } else {
- return lang;
}
}
}