X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=supported%2FBasicSupport.java;h=7dbd1365aa1970f2b08000420728f85b65e7c1a8;hb=920af1c747538e949df24d29cf778d597be9a482;hp=d3c0ebb9a379a52047f554622bf56fa892af2d20;hpb=0fc81e6465aa9c1f1dfc19b532082220d609768a;p=nikiroo-utils.git

diff --git a/supported/BasicSupport.java b/supported/BasicSupport.java
index d3c0ebb..7dbd136 100644
--- a/supported/BasicSupport.java
+++ b/supported/BasicSupport.java
@@ -224,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());
 	}
 
 	/**
@@ -274,6 +273,7 @@ public abstract class BasicSupport {
 			meta.setCreationDate(StringUtils.fromTime(new Date().getTime()));
 		}
 		story.setMeta(meta);
+		pg.put("meta", meta);
 
 		pg.setProgress(50);
 
@@ -284,12 +284,9 @@ public abstract class BasicSupport {
 		pg.setProgress(60);
 
 		if (getDesc) {
-			String descChapterName = Instance.getTrans().getString(
-					StringId.DESCRIPTION);
-			story.getMeta().setResume(
-					bsPara.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();
@@ -340,14 +337,17 @@ 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.put("meta", story.getMeta());
 
-		pg.setName("Retrieving " + story.getMeta().getTitle());
+		pg.setName(story.getMeta().getTitle());
 
 		Progress pgGetChapters = new Progress();
 		pg.addProgress(pgGetChapters, 10);
@@ -394,6 +394,7 @@ public abstract class BasicSupport {
 			pgChaps.done();
 		}
 
+		pg.setName(story.getMeta().getTitle());
 		pg.done();
 
 		return story;
@@ -493,8 +494,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();