From: Niki Roo <niki@nikiroo.be>
Date: Mon, 4 Mar 2019 06:26:18 +0000 (+0100)
Subject: improve progress code
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=68328e172319fe97d76805d60f560376af2fcb5b;p=fanfix-jexer.git

improve progress code
---

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 6843a02..388f572 100644
--- 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 c098d11..d3beea5 100644
--- 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) {