from subtree: improve progress names

[fanfix.git] / src / be / nikiroo / fanfix / supported / BasicSupport.java

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 092f89e2a35bba003761046e483ed7f5766a8844..ba2164cacac6f077ab1f4d1c97e23b9d9a56f31d 100644 (file)
--- 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());
        }
 
        /**
@@ -274,18 +277,15 @@ 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);
 
                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();
@@ -336,6 +336,8 @@ public abstract class BasicSupport {
                } else {
                        pg.setMinMax(0, 100);
                }
+               
+               pg.setName("Initialising");
 
                pg.setProgress(1);
                Progress pgMeta = new Progress();
@@ -343,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);
@@ -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();
 
@@ -390,6 +392,7 @@ public abstract class BasicSupport {
                        pgChaps.done();
                }
 
+               pg.setName(story.getMeta().getTitle());
                pg.done();
 
                return story;
@@ -414,7 +417,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 +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();