X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=supported%2FBasicSupport.java;h=9b56f885d94a14ff1025b3833aa34209c48374dd;hb=bb7d9ea97cc614a04dd45f342a4caeeb7dcb23fe;hp=17cbec5a984b59c5af1e053aefabdccb2e120140;hpb=75a6a3eadc87e42bb0c9808e359d23d03801a9a2;p=fanfix.git

diff --git a/supported/BasicSupport.java b/supported/BasicSupport.java
index 17cbec5..9b56f88 100644
--- a/supported/BasicSupport.java
+++ b/supported/BasicSupport.java
@@ -12,6 +12,7 @@ import java.util.Map;
 import java.util.Scanner;
 import java.util.Map.Entry;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.jsoup.helper.DataUtil;
 import org.jsoup.nodes.Document;
@@ -271,7 +272,14 @@ public abstract class BasicSupport {
 		pg.setProgress(30);
 
 		Story story = new Story();
+		
 		MetaData meta = getMeta();
+		meta.setType(getType().toString());
+		meta.setSource(getType().getSourceName());
+		if (meta.getPublisher() == null) {
+			meta.setPublisher(getType().getSourceName());
+		}
+
 		if (meta.getCreationDate() == null
 				|| meta.getCreationDate().trim().isEmpty()) {
 			meta.setCreationDate(bsHelper
@@ -346,7 +354,12 @@ public abstract class BasicSupport {
 			Scanner scan = new Scanner(in);
 			scan.useDelimiter("\0");
 			try {
+				if(!scan.hasNext())
+					throw new IOException("The given input was empty");
+				
 				return new JSONObject(scan.next());
+			} catch (JSONException e) {
+				throw new IOException(e);
 			} finally {
 				scan.close();
 			}
@@ -384,6 +397,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 +445,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 +476,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();