X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFimfictionApi.java;h=ee436f165851e64ecffc80eede9ba53651f1edfb;hb=312e756ed0306e3287f1bf111a5fab9027d46a92;hp=9c3e71ddb00a1c4b7ad7f84ab7bc639401c539e1;hpb=77e28d38d47dbfcf29030ee388854d59df3ef1d0;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/supported/FimfictionApi.java b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
index 9c3e71d..ee436f1 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 = "
* * *
" + notes;
+ }
+
chapterNames.put(number, title);
chapterContents
- .put(number, content + "
* * *
" + notes);
+ .put(number, content + notes);
urls.add(new Entry() {
@Override
@@ -246,6 +254,7 @@ class FimfictionApi extends BasicSupport {
null, null);
String jsonToken = IOUtils.readSmallStream(in);
+ in.close();
// Extract token type and token from: {
// token_type = "Bearer",
@@ -283,15 +292,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 +311,10 @@ class FimfictionApi extends BasicSupport {
result = wip.substring(0, pos);
}
}
-
+
+ result = result.replace("\\t", "\t")
+ .replace("\\\"", "\"");
+
return result;
}