From 68328e172319fe97d76805d60f560376af2fcb5b Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Mon, 4 Mar 2019 07:26:18 +0100 Subject: [PATCH] improve progress code --- .../fanfix/supported/BasicSupport.java | 22 +++++-------------- .../fanfix/supported/BasicSupportPara.java | 5 +++-- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java index 6843a02e..388f5722 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()); List> 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 c098d110..d3beea53 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 lines = new ArrayList(); 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 newParas = new ArrayList(); for (Paragraph para : paras) { -- 2.27.0