X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=c47d05e608dd43de574aa69cc96ee677168eccee;hp=61a4500759bccb26366d23ade04f07053c169dcb;hb=92fb0719f84f5b6734b51e528332546d78e9ccec;hpb=333f0e7b5e333e8f6222881ce35398f403fc4121

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 61a4500..c47d05e 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -14,8 +14,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Scanner;
 
-import javax.imageio.ImageIO;
-
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.StringId;
@@ -24,7 +22,9 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.ui.Progress;
 
 /**
  * This class is the base class used by the other support classes. It can be
@@ -329,26 +329,42 @@ public abstract class BasicSupport {
 	 * 
 	 * @param url
 	 *            the story resource
+	 * @param pg
+	 *            the optional progress reporter
 	 * 
 	 * @return the {@link Story}
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	public Story process(URL url) throws IOException {
+	public Story process(URL url, Progress pg) throws IOException {
+		if (pg == null) {
+			pg = new Progress();
+		} else {
+			pg.setMinMax(0, 100);
+		}
+
 		setCurrentReferer(url);
 
+		pg.setProgress(1);
 		try {
 			Story story = processMeta(url, false, true);
+			pg.setProgress(10);
 			if (story == null) {
+				pg.setProgress(100);
 				return null;
 			}
 
 			story.setChapters(new ArrayList<Chapter>());
 
 			List<Entry<String, URL>> chapters = getChapters(url, getInput());
+			pg.setProgress(20);
+
 			int i = 1;
 			if (chapters != null) {
+				Progress pgChaps = new Progress(0, chapters.size());
+				pg.addProgress(pgChaps, 80);
+
 				for (Entry<String, URL> chap : chapters) {
 					setCurrentReferer(chap.getValue());
 					InputStream chapIn = Instance.getCache().open(
@@ -361,8 +377,11 @@ public abstract class BasicSupport {
 						chapIn.close();
 					}
 
+					pgChaps.setProgress(i);
 					i++;
 				}
+			} else {
+				pg.setProgress(100);
 			}
 
 			return story;
@@ -466,7 +485,6 @@ public abstract class BasicSupport {
 	 */
 	protected Chapter makeChapter(URL source, int number, String name,
 			String content) throws IOException {
-
 		// Chapter name: process it correctly, then remove the possible
 		// redundant "Chapter x: " in front of it
 		String chapterName = processPara(name).getContent().trim();
@@ -609,7 +627,7 @@ public abstract class BasicSupport {
 			InputStream in = null;
 			try {
 				in = Instance.getCache().open(url, getSupport(url), true);
-				return ImageIO.read(in);
+				return IOUtils.toImage(in);
 			} catch (IOException e) {
 			} finally {
 				if (in != null) {
@@ -764,6 +782,22 @@ public abstract class BasicSupport {
 			boolean singleQ = line.startsWith("" + openQuote);
 			boolean doubleQ = line.startsWith("" + openDoubleQuote);
 
+			// Do not try when more than one quote at a time
+			// (some stories are not easily readable if we do)
+			if (singleQ
+					&& line.indexOf(closeQuote, 1) < line
+							.lastIndexOf(closeQuote)) {
+				newParas.add(para);
+				return newParas;
+			}
+			if (doubleQ
+					&& line.indexOf(closeDoubleQuote, 1) < line
+							.lastIndexOf(closeDoubleQuote)) {
+				newParas.add(para);
+				return newParas;
+			}
+			//
+
 			if (!singleQ && !doubleQ) {
 				line = openDoubleQuote + line + closeDoubleQuote;
 				newParas.add(new Paragraph(ParagraphType.QUOTE, line));