improve progress code

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 6843a02ef26f26a09de8869cbc1a1e1489fb493d..388f57222cf41da10d24a354626cb6409195304a 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -348,9 +348,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 +356,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 +381,10 @@ public abstract class BasicSupport {
 
                                String content = getChapterContent(chapUrl, i,
                                                pgGetChapterContent);
-                               if (!pgGetChapterContent.isDone()) {
-                                       pgGetChapterContent.setProgress(pgGetChapterContent
-                                                       .getMax());
-                               }
-
+                               pgGetChapterContent.done();
                                Chapter cc = BasicSupportPara.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,10 +394,10 @@ public abstract class BasicSupport {
                        }
 
                        pgChaps.setName("Extracting chapters");
-               } else {
-                       pg.setProgress(80);
                }
 
+               pg.done();
+
                return story;
        }
 

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupportPara.java b/src/be/nikiroo/fanfix/supported/BasicSupportPara.java
index c098d110892c59c90e30b4e581dad8639782fb39..d3beea53b47c39b251c5b31647397f54628ac54f 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/BasicSupportPara.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupportPara.java
@@ -450,7 +450,6 @@ class BasicSupportPara {
                                        paras.add(makeParagraph(support, source, line.trim(), html));
                                        pg.setProgress(i++);
                                }
-                               pg.setName(null);
                        } else {
                                List<String> lines = new ArrayList<String>();
                                BufferedReader buff = null;
@@ -477,9 +476,11 @@ class BasicSupportPara {
                                        paras.add(makeParagraph(support, source, line, html));
                                        pg.setProgress(i++);
                                }
-                               pg.setName(null);
                        }
 
+                       pg.done();
+                       pg.setName(null);
+
                        // Check quotes for "bad" format
                        List<Paragraph> newParas = new ArrayList<Paragraph>();
                        for (Paragraph para : paras) {