X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=35a6ac353be34fe8c52607fdb9f963d895c2603b;hb=97654d115d9f0286f9eea9fe50216cb3737e9ed6;hp=61f46211e3af3907579f6c4e60893670dc335d79;hpb=99d71bd72a857dc3db08bc52047abec3dd27f2fa;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 61f4621..35a6ac3 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -37,6 +37,10 @@ public abstract class BasicSupport {
 	private URL source;
 	private SupportType type;
 	private URL currentReferer; // with only one 'r', as in 'HTTP'...
+	
+	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}.
@@ -220,8 +224,7 @@ public abstract class BasicSupport {
 	 */
 	protected Document loadDocument(URL source) throws IOException {
 		String url = getCanonicalUrl(source).toString();
-		return DataUtil.load(Instance.getCache().open(source, this, false),
-				"UTF-8", url.toString());
+		return DataUtil.load(Instance.getInstance().getCache().open(source, this, false), "UTF-8", url.toString());
 	}
 
 	/**
@@ -270,22 +273,20 @@ public abstract class BasicSupport {
 			meta.setCreationDate(StringUtils.fromTime(new Date().getTime()));
 		}
 		story.setMeta(meta);
+		pg.put("meta", meta);
 
 		pg.setProgress(50);
 
 		if (meta.getCover() == null) {
-			meta.setCover(BasicSupportHelper.getDefaultCover(meta.getSubject()));
+			meta.setCover(bsHelper.getDefaultCover(meta.getSubject()));
 		}
 
 		pg.setProgress(60);
 
 		if (getDesc) {
-			String descChapterName = Instance.getTrans().getString(
-					StringId.DESCRIPTION);
-			story.getMeta().setResume(
-					BasicSupportPara.makeChapter(this, source, 0,
-							descChapterName, //
-							getDesc(), isHtml(), null));
+			String descChapterName = Instance.getInstance().getTrans().getString(StringId.DESCRIPTION);
+			story.getMeta().setResume(bsPara.makeChapter(this, source, 0, descChapterName, //
+					getDesc(), isHtml(), null));
 		}
 
 		pg.done();
@@ -304,7 +305,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();
@@ -336,14 +337,15 @@ public abstract class BasicSupport {
 		} else {
 			pg.setMinMax(0, 100);
 		}
+		
+		pg.setName("Initialising");
 
 		pg.setProgress(1);
 		Progress pgMeta = new Progress();
 		pg.addProgress(pgMeta, 10);
 		Story story = processMeta(true, pgMeta);
 		pgMeta.done(); // 10%
-
-		pg.setName("Retrieving " + story.getMeta().getTitle());
+		pg.put("meta", story.getMeta());
 
 		Progress pgGetChapters = new Progress();
 		pg.addProgress(pgGetChapters, 10);
@@ -375,7 +377,7 @@ public abstract class BasicSupport {
 				String content = getChapterContent(chapUrl, i,
 						pgGetChapterContent);
 				pgGetChapterContent.done();
-				Chapter cc = BasicSupportPara.makeChapter(this, chapUrl, i,
+				Chapter cc = bsPara.makeChapter(this, chapUrl, i,
 						chapName, content, isHtml(), pgMakeChapter);
 				pgMakeChapter.done();
 
@@ -414,7 +416,7 @@ public abstract class BasicSupport {
 	 */
 	public Chapter makeChapter(URL source, int number, String name,
 			String content) throws IOException {
-		return BasicSupportPara.makeChapter(this, source, number, name,
+		return bsPara.makeChapter(this, source, number, name,
 				content, isHtml(), null);
 	}
 
@@ -489,8 +491,8 @@ public abstract class BasicSupport {
 		case TEXT:
 			support = new Text();
 			break;
-		case MANGAFOX:
-			support = new MangaFox();
+		case MANGAHUB:
+			support = new MangaHub();
 			break;
 		case E621:
 			support = new E621();