import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.Config;
+import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.fanfix.data.Paragraph;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.ImageUtils;
import be.nikiroo.utils.Progress;
try {
in.reset();
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException("Cannot reset the Text stream", e));
+ Instance.getInstance().getTraceHandler().error(new IOException("Cannot reset the Text stream", e));
}
return in;
meta.setType(getType().toString());
meta.setImageDocument(false);
meta.setCover(getCover(getSourceFile()));
-
+
return meta;
}
@Override
protected String getDesc() throws IOException {
- return getChapterContent(null, 0, null);
+ String content = getChapterContent(null, 0, null).trim();
+ if (!content.isEmpty()) {
+ Chapter desc = bsPara.makeChapter(this, null, 0, "Description",
+ content, isHtml(), null);
+ StringBuilder builder = new StringBuilder();
+ for (Paragraph para : desc) {
+ if (builder.length() > 0) {
+ builder.append("\n");
+ }
+ builder.append(para.getContent());
+ }
+ }
+
+ return content;
}
- private Image getCover(File sourceFile) {
+ protected Image getCover(File sourceFile) {
String path = sourceFile.getName();
for (String ext : new String[] { ".txt", ".text", ".story" }) {
}
}
- Image cover = bsImages.getImage(this,
- sourceFile.getParentFile(), path);
+ Image cover = bsImages.getImage(this, sourceFile.getParentFile(), path);
if (cover != null) {
try {
- File tmp = Instance.getTempFiles().createTempFile(
- "test_cover_image");
+ File tmp = Instance.getInstance().getTempFiles().createTempFile("test_cover_image");
ImageUtils.getInstance().saveAsImage(cover, tmp, "png");
tmp.delete();
} catch (IOException e) {
boolean inChap = false;
while (scan.hasNext()) {
String line = scan.next();
- if (detectChapter(line, number) != null) {
+ if (!inChap && detectChapter(line, number) != null) {
inChap = true;
- } else if (inChap && detectChapter(line, number + 1) != null) {
+ } else if (detectChapter(line, number + 1) != null) {
break;
} else if (inChap) {
builder.append(line);
try {
in.close();
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException(
- "Cannot close the text source file input", e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Cannot close the text source file input", e));
}
}
/**
* Check if we supports this {@link URL}, that is, if the info file can be
* found OR not found.
+ * <p>
+ * It must also be a file, not another kind of URL.
*
* @param url
* the {@link URL} to check
* @return TRUE if it is supported
*/
protected boolean supports(URL url, boolean info) {
- boolean infoPresent = false;
- if ("file".equals(url.getProtocol())) {
- File file;
- try {
- file = new File(url.toURI());
- file = assureNoTxt(file);
- file = new File(file.getPath() + ".info");
- } catch (URISyntaxException e) {
- Instance.getTraceHandler().error(e);
- file = null;
- }
+ if (!"file".equals(url.getProtocol())) {
+ return false;
+ }
- infoPresent = (file != null && file.exists());
+ boolean infoPresent = false;
+ File file;
+ try {
+ file = new File(url.toURI());
+ file = assureNoTxt(file);
+ file = new File(file.getPath() + ".info");
+ } catch (URISyntaxException e) {
+ Instance.getInstance().getTraceHandler().error(e);
+ file = null;
}
+ infoPresent = (file != null && file.exists());
+
return infoPresent == info;
}
/**
- * Remove the ".txt" extension if it is present.
+ * Remove the ".txt" (or ".text") extension if it is present.
*
* @param file
* the file to process
* was present
*/
protected File assureNoTxt(File file) {
- if (file.getName().endsWith(".txt")) {
- file = new File(file.getPath().substring(0,
- file.getPath().length() - 4));
+ for (String ext : new String[] { ".txt", ".text" }) {
+ if (file.getName().endsWith(ext)) {
+ file = new File(file.getPath().substring(0,
+ file.getPath().length() - ext.length()));
+ }
}
return file;
*
* @param line
* the line to check
+ * @param number
+ * the specific chapter number to check for
*
* @return the language or NULL
*/
static private String detectChapter(String line, int number) {
line = line.toUpperCase();
- for (String lang : Instance.getConfig().getList(Config.CONF_CHAPTER)) {
- String chapter = Instance.getConfig().getStringX(Config.CONF_CHAPTER,
- lang);
+ for (String lang : Instance.getInstance().getConfig().getList(Config.CONF_CHAPTER)) {
+ String chapter = Instance.getInstance().getConfig().getStringX(Config.CONF_CHAPTER, lang);
if (chapter != null && !chapter.isEmpty()) {
chapter = chapter.toUpperCase() + " ";
if (line.startsWith(chapter)) {
// We want "[CHAPTER] [number]: [name]", with ": [name]"
// optional
String test = line.substring(chapter.length()).trim();
+
+ String possibleNum = test.trim();
+ if (possibleNum.indexOf(':') > 0) {
+ possibleNum = possibleNum.substring(0,
+ possibleNum.indexOf(':')).trim();
+ }
+
if (test.startsWith(Integer.toString(number))) {
test = test
.substring(Integer.toString(number).length())