X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FText.java;h=fb4a0ad2a7d97c73dcbe37a025df58a0e8f931c4;hb=86d49dbc7c3eca665b7823b5de49bb73a31c7722;hp=2dd052470278886f30b715f541ca571d7967ae50;hpb=333f0e7b5e333e8f6222881ce35398f403fc4121;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java
index 2dd0524..fb4a0ad 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</li>
  * <li>A description of the story must be given as chapter number 0</li>
  * <li>A cover may be present, with the same filename but a PNG, JPEG or JPG
- * extension</li<
+ * extension</li>
  * </ul>
  * 
  * @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;
 		}
 
@@ -164,41 +170,39 @@ class Text extends BasicSupport {
 	}
 
 	@Override
-	protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-			throws IOException {
+	protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+			Progress pg) throws IOException {
 		List<Entry<String, URL>> chaps = new ArrayList<Entry<String, URL>>();
 		@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<String, URL>() {
+					@Override
+					public URL setValue(URL value) {
+						return null;
 					}
-					final URL value = source;
-					final String key = chapName;
-					chaps.add(new Entry<String, URL>() {
-						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);
@@ -232,33 +236,55 @@ class Text extends BasicSupport {
 
 	@Override
 	protected boolean supports(URL url) {
+		return supports(url, false);
+	}
+
+	/**
+	 * Check if we supports this {@link URL}, that is, if the info file can be
+	 * found OR not found.
+	 * 
+	 * @param url
+	 *            the {@link URL} to check
+	 * @param info
+	 *            TRUE to require the info file, FALSE to forbid the info file
+	 * 
+	 * @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.syserr(e);
+				Instance.getTraceHandler().error(e);
 				file = null;
 			}
 
-			return file == null || !file.exists();
+			infoPresent = (file != null && file.exists());
 		}
 
-		return false;
+		return infoPresent == info;
 	}
 
 	/**
-	 * 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).
+	 * Remove the ".txt" extension if it is present.
 	 * 
-	 * @param line
-	 *            the line to check
+	 * @param file
+	 *            the file to process
 	 * 
-	 * @return the language or NULL
+	 * @return the same file or a copy of it without the ".txt" extension if it
+	 *         was present
 	 */
-	private String detectChapter(String line) {
-		return detectChapter(line, null);
+	protected File assureNoTxt(File file) {
+		if (file.getName().endsWith(".txt")) {
+			file = new File(file.getPath().substring(0,
+					file.getPath().length() - 4));
+		}
+
+		return file;
 	}
 
 	/**
@@ -270,7 +296,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 +305,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;
 					}
 				}
 			}