From: Niki Roo <niki@nikiroo.be>
Date: Thu, 17 Aug 2017 07:04:15 +0000 (+0200)
Subject: FimFictionApi: fix for \t and \"
X-Git-Tag: fanfix-1.6.0~2
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=fce43164126e813a4cdb2571a4d8d83c885314e5

FimFictionApi: fix for \t and \"
---

diff --git a/src/be/nikiroo/fanfix/supported/FimfictionApi.java b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
index 9c3e71d..3319bbe 100644
--- a/src/be/nikiroo/fanfix/supported/FimfictionApi.java
+++ b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
@@ -132,8 +132,12 @@ class FimfictionApi extends BasicSupport {
 		meta.setSubject("MLP");
 		meta.setType(getType().toString());
 		meta.setImageDocument(false);
-		meta.setCover(getImage(this, null,
-				getKeyJson(json, 0, "type", "story", "cover_image", "full")));
+		
+		String coverImageLink = 
+				getKeyJson(json, 0, "type", "story", "cover_image", "full");
+		if (!coverImageLink.trim().isEmpty()) {
+			meta.setCover(getImage(this, null, coverImageLink.trim()));
+		}
 
 		return meta;
 	}
@@ -146,7 +150,7 @@ class FimfictionApi extends BasicSupport {
 		while (pos >= 0) {
 			pos = indexOfJsonAfter(json, pos, "type", "story_tag");
 			if (pos >= 0) {
-				tags.add(getKeyJson(json, pos, "name"));
+				tags.add(getKeyJson(json, pos, "name").trim());
 			}
 		}
 
@@ -178,10 +182,14 @@ class FimfictionApi extends BasicSupport {
 				final String title = getKeyJson(json, pos, "title");
 				String notes = getKeyJson(json, pos, "authors_note_html");
 				String content = getKeyJson(json, pos, "content_html");
-
+				
+				if (!notes.trim().isEmpty()) {
+					notes = "<br/>* * *<br/>" + notes;
+				}
+				
 				chapterNames.put(number, title);
 				chapterContents
-						.put(number, content + "<br/>* * *<br/>" + notes);
+						.put(number, content + notes);
 
 				urls.add(new Entry<String, URL>() {
 					@Override
@@ -283,15 +291,15 @@ class FimfictionApi extends BasicSupport {
 	}
 
 	// afters: [name, value] pairs (or "" for any of them), can end without
-	// value
+	// value but will then be empty, not NULL
 	static private String getKeyJson(String json, int startAt,
 			String... afterKeys) {
 		int pos = indexOfJsonAfter(json, startAt, afterKeys);
 		if (pos < 0) {
-			return null;
+			return "";
 		}
 
-		String result = null;
+		String result = "";
 		String wip = json.substring(pos);
 
 		pos = nextUnescapedQuote(wip, 0);
@@ -302,7 +310,10 @@ class FimfictionApi extends BasicSupport {
 				result = wip.substring(0, pos);
 			}
 		}
-
+		
+		result = result.replace("\\t", "\t")
+			.replace("\\\"", "\"");
+		
 		return result;
 	}