X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=d3c0ebb9a379a52047f554622bf56fa892af2d20;hp=6843a02ef26f26a09de8869cbc1a1e1489fb493d;hb=8d59ce0748baeeea0458bab49716ab4543aae439;hpb=6dd591f08aa6130391dd47ec60db5ae046c1e505

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 6843a02..d3c0ebb 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -37,13 +37,10 @@ public abstract class BasicSupport {
 	private URL source;
 	private SupportType type;
 	private URL currentReferer; // with only one 'r', as in 'HTTP'...
-
-	/**
-	 * The name of this support class.
-	 * 
-	 * @return the name
-	 */
-	protected abstract String getSourceName();
+	
+	static protected BasicSupportHelper bsHelper = new BasicSupportHelper();
+	static protected BasicSupportImages bsImages = new BasicSupportImages();
+	static protected BasicSupportPara bsPara = new BasicSupportPara(new BasicSupportHelper(), new BasicSupportImages());
 
 	/**
 	 * Check if the given resource is supported by this {@link BasicSupport}.
@@ -281,7 +278,7 @@ public abstract class BasicSupport {
 		pg.setProgress(50);
 
 		if (meta.getCover() == null) {
-			meta.setCover(BasicSupportHelper.getDefaultCover(meta.getSubject()));
+			meta.setCover(bsHelper.getDefaultCover(meta.getSubject()));
 		}
 
 		pg.setProgress(60);
@@ -290,12 +287,12 @@ public abstract class BasicSupport {
 			String descChapterName = Instance.getTrans().getString(
 					StringId.DESCRIPTION);
 			story.getMeta().setResume(
-					BasicSupportPara.makeChapter(this, source, 0,
+					bsPara.makeChapter(this, source, 0,
 							descChapterName, //
 							getDesc(), isHtml(), null));
 		}
 
-		pg.setProgress(100);
+		pg.done();
 		return story;
 	}
 
@@ -311,7 +308,7 @@ public abstract class BasicSupport {
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	// ADD final when BasicSupport_Deprecated is gone
+	// TODO: ADD final when BasicSupport_Deprecated is gone
 	public Story process(Progress pg) throws IOException {
 		setCurrentReferer(source);
 		login();
@@ -348,9 +345,7 @@ public abstract class BasicSupport {
 		Progress pgMeta = new Progress();
 		pg.addProgress(pgMeta, 10);
 		Story story = processMeta(true, pgMeta);
-		if (!pgMeta.isDone()) {
-			pgMeta.setProgress(pgMeta.getMax()); // 10%
-		}
+		pgMeta.done(); // 10%
 
 		pg.setName("Retrieving " + story.getMeta().getTitle());
 
@@ -358,9 +353,7 @@ public abstract class BasicSupport {
 		pg.addProgress(pgGetChapters, 10);
 		story.setChapters(new ArrayList<Chapter>());
 		List<Entry<String, URL>> chapters = getChapters(pgGetChapters);
-		if (!pgGetChapters.isDone()) {
-			pgGetChapters.setProgress(pgGetChapters.getMax()); // 20%
-		}
+		pgGetChapters.done(); // 20%
 
 		if (chapters != null) {
 			Progress pgChaps = new Progress("Extracting chapters", 0,
@@ -385,16 +378,10 @@ public abstract class BasicSupport {
 
 				String content = getChapterContent(chapUrl, i,
 						pgGetChapterContent);
-				if (!pgGetChapterContent.isDone()) {
-					pgGetChapterContent.setProgress(pgGetChapterContent
-							.getMax());
-				}
-
-				Chapter cc = BasicSupportPara.makeChapter(this, chapUrl, i,
+				pgGetChapterContent.done();
+				Chapter cc = bsPara.makeChapter(this, chapUrl, i,
 						chapName, content, isHtml(), pgMakeChapter);
-				if (!pgMakeChapter.isDone()) {
-					pgMakeChapter.setProgress(pgMakeChapter.getMax());
-				}
+				pgMakeChapter.done();
 
 				words += cc.getWords();
 				story.getChapters().add(cc);
@@ -404,13 +391,37 @@ public abstract class BasicSupport {
 			}
 
 			pgChaps.setName("Extracting chapters");
-		} else {
-			pg.setProgress(80);
+			pgChaps.done();
 		}
 
+		pg.done();
+
 		return story;
 	}
 
+	/**
+	 * Create a chapter from the given data.
+	 * 
+	 * @param source
+	 *            the source URL for this content, which can be used to try and
+	 *            find images if images are present in the format [image-url]
+	 * @param number
+	 *            the chapter number (0 = description)
+	 * @param name
+	 *            the chapter name
+	 * @param content
+	 *            the content of the chapter
+	 * @return the {@link Chapter}
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public Chapter makeChapter(URL source, int number, String name,
+			String content) throws IOException {
+		return bsPara.makeChapter(this, source, number, name,
+				content, isHtml(), null);
+	}
+
 	/**
 	 * Return a {@link BasicSupport} implementation supporting the given
 	 * resource if possible.
@@ -450,10 +461,11 @@ public abstract class BasicSupport {
 	 * Return a {@link BasicSupport} implementation supporting the given type.
 	 * 
 	 * @param type
-	 *            the type
+	 *            the type, must not be NULL
 	 * @param url
 	 *            the {@link URL} to support (can be NULL to get an
-	 *            "abstract support")
+	 *            "abstract support"; if not NULL, will be used as the source
+	 *            URL)
 	 * 
 	 * @return an implementation that supports it, or NULL
 	 */