From: Niki Roo <niki@nikiroo.be>
Date: Sun, 3 May 2020 10:37:40 +0000 (+0200)
Subject: fix wordcount on one-chapter stories
X-Git-Tag: fanfix-swing-1.2.0~5^2~7
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=5d1908806b94d005ca58ca03cb195faf56edba5f;p=fanfix-swing.git

fix wordcount on one-chapter stories
---

diff --git a/supported/BasicSupport.java b/supported/BasicSupport.java
index 17cbec5a..f1635589 100644
--- a/supported/BasicSupport.java
+++ b/supported/BasicSupport.java
@@ -384,6 +384,7 @@ public abstract class BasicSupport {
 				resume.setName("");
 				resume.setNumber(1);
 				story.getChapters().add(resume);
+				story.getMeta().setWords(resume.getWords());
 
 				String descChapterName = Instance.getInstance().getTrans()
 						.getString(StringId.DESCRIPTION);
@@ -431,7 +432,7 @@ public abstract class BasicSupport {
 		story.setChapters(new ArrayList<Chapter>());
 		List<Entry<String, URL>> chapters = getChapters(pgGetChapters);
 		pgGetChapters.done(); // 20%
-
+		
 		if (chapters != null) {
 			Progress pgChaps = new Progress("Extracting chapters", 0,
 					chapters.size() * 300);
@@ -462,10 +463,11 @@ public abstract class BasicSupport {
 
 				words += cc.getWords();
 				story.getChapters().add(cc);
-				story.getMeta().setWords(words);
 
 				i++;
 			}
+			
+			story.getMeta().setWords(words);
 
 			pgChaps.setName("Extracting chapters");
 			pgChaps.done();
diff --git a/supported/BasicSupport_Deprecated.java b/supported/BasicSupport_Deprecated.java
index ad030c0c..a50ee3cf 100644
--- a/supported/BasicSupport_Deprecated.java
+++ b/supported/BasicSupport_Deprecated.java
@@ -317,7 +317,6 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 
 						words += cc.getWords();
 						story.getChapters().add(cc);
-						story.getMeta().setWords(words);
 					} finally {
 						if (chapIn != null) {
 							chapIn.close();
@@ -326,6 +325,8 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 
 					i++;
 				}
+				
+				story.getMeta().setWords(words);
 
 				pgChaps.setName("Extracting chapters");
 			} else {
@@ -340,6 +341,7 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 				resume.setName("");
 				resume.setNumber(1);
 				story.getChapters().add(resume);
+				story.getMeta().setWords(resume.getWords());
 
 				String descChapterName = Instance.getInstance().getTrans()
 						.getString(StringId.DESCRIPTION);