X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=supported%2FBasicSupport.java;h=ba2164cacac6f077ab1f4d1c97e23b9d9a56f31d;hb=3b039231be91c50e3d1bd59492205d61a0928494;hp=d3c0ebb9a379a52047f554622bf56fa892af2d20;hpb=0fc81e6465aa9c1f1dfc19b532082220d609768a;p=nikiroo-utils.git diff --git a/supported/BasicSupport.java b/supported/BasicSupport.java index d3c0ebb..ba2164c 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()); } /** @@ -284,12 +283,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,6 +336,8 @@ public abstract class BasicSupport { } else { pg.setMinMax(0, 100); } + + pg.setName("Initialising"); pg.setProgress(1); Progress pgMeta = new Progress(); @@ -347,7 +345,7 @@ public abstract class BasicSupport { Story story = processMeta(true, pgMeta); pgMeta.done(); // 10% - pg.setName("Retrieving " + story.getMeta().getTitle()); + pg.setName(story.getMeta().getTitle()); Progress pgGetChapters = new Progress(); pg.addProgress(pgGetChapters, 10); @@ -394,6 +392,7 @@ public abstract class BasicSupport { pgChaps.done(); } + pg.setName(story.getMeta().getTitle()); pg.done(); return story; @@ -493,8 +492,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();