Some fixes:

[fanfix.git] / src / be / nikiroo / fanfix / supported / FimfictionApi.java

diff --git a/src/be/nikiroo/fanfix/supported/FimfictionApi.java b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
index 591bbb08736c921333b885c19548c51e7d5c78c2..9c3e71ddb00a1c4b7ad7f84ab7bc639401c539e1 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/FimfictionApi.java
+++ b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
@@ -87,19 +87,15 @@ class FimfictionApi extends BasicSupport {
                // Selectors, so to download all I need and only what I need
                String storyContent = "fields[story]=title,description,date_published,cover_image";
                String authorContent = "fields[author]=name";
-               String chapterContent = "fields[chapter]=chapter_number,title,content,authors_note";
-               String contentContent = "fields[content]=html";
-               String authorsNoteContent = "fields[authors_note]=html";
+               String chapterContent = "fields[chapter]=chapter_number,title,content_html,authors_note_html";
                String includes = "author,chapters,tags";
 
                String urlString = String.format(
                                "https://www.fimfiction.net/api/v2/stories/%s?" //
-                                               + "%s&%s&"//
                                                + "%s&%s&%s&" //
                                                + "include=%s", //
                                storyId, //
-                               storyContent, authorContent, //
-                               chapterContent, contentContent, authorsNoteContent,//
+                               storyContent, authorContent, chapterContent,//
                                includes);
 
                // URL params must be URL-encoded: "[ ]" <-> "%5B %5D"
@@ -159,7 +155,8 @@ class FimfictionApi extends BasicSupport {
 
        @Override
        protected String getDesc(URL source, InputStream in) {
-               return getKeyJson(json, 0, "type", "story", "description");
+               String desc = getKeyJson(json, 0, "type", "story", "description");
+               return unbbcode(desc);
        }
 
        @Override
@@ -179,8 +176,8 @@ class FimfictionApi extends BasicSupport {
                                final int number = Integer.parseInt(json.substring(posNumber,
                                                posComa).trim());
                                final String title = getKeyJson(json, pos, "title");
-                               String notes = getKeyJson(json, pos, "authors_note", "html");
-                               String content = getKeyJson(json, pos, "content", "html");
+                               String notes = getKeyJson(json, pos, "authors_note_html");
+                               String content = getKeyJson(json, pos, "content_html");
 
                                chapterNames.put(number, title);
                                chapterContents
@@ -220,6 +217,24 @@ class FimfictionApi extends BasicSupport {
                                || "www.fimfiction.net".equals(url.getHost());
        }
 
+       /**
+        * Generate a new token from the client ID and secret.
+        * <p>
+        * Note that those tokens are long-lived, and it would be badly seen to
+        * create a lot of them without due cause.
+        * <p>
+        * So, please cache and re-use them.
+        * 
+        * @param clientId
+        *            the client ID offered on FimFiction
+        * @param clientSecret
+        *            the client secret that goes with it
+        * 
+        * @return a new generated token linked to that client ID
+        * 
+        * @throws IOException
+        *             in case of I/O errors
+        */
        static private String generateOAuth(String clientId, String clientSecret)
                        throws IOException {
                URL url = new URL("https://www.fimfiction.net/api/v2/token");
@@ -233,18 +248,13 @@ class FimfictionApi extends BasicSupport {
                String jsonToken = IOUtils.readSmallStream(in);
 
                // Extract token type and token from: {
-               // token_type = "bearer",
+               // token_type = "Bearer",
                // access_token = "xxxxxxxxxxxxxx"
                // }
 
                String token = getKeyText(jsonToken, "\"access_token\"", "\"", "\"");
                String tokenType = getKeyText(jsonToken, "\"token_type\"", "\"", "\"");
 
-               // TODO: remove this once the bug is fixed on the server side
-               if ("bearer".equals(tokenType)) {
-                       tokenType = "Bearer";
-               }
-
                return tokenType + " " + token;
        }
 
@@ -281,6 +291,43 @@ class FimfictionApi extends BasicSupport {
                        return null;
                }
 
-               return getKeyText(json.substring(pos), "\"", null, "\"");
+               String result = null;
+               String wip = json.substring(pos);
+
+               pos = nextUnescapedQuote(wip, 0);
+               if (pos >= 0) {
+                       wip = wip.substring(pos + 1);
+                       pos = nextUnescapedQuote(wip, 0);
+                       if (pos >= 0) {
+                               result = wip.substring(0, pos);
+                       }
+               }
+
+               return result;
+       }
+
+       // next " but don't take \" into account
+       static private int nextUnescapedQuote(String result, int pos) {
+               while (pos >= 0) {
+                       pos = result.indexOf("\"", pos);
+                       if (pos == 0 || (pos > 0 && result.charAt(pos - 1) != '\\')) {
+                               break;
+                       }
+
+                       if (pos < result.length()) {
+                               pos++;
+                       }
+               }
+
+               return pos;
+       }
+
+       // quick & dirty filter
+       static private String unbbcode(String bbcode) {
+               String text = bbcode.replace("\\r\\n", "<br/>") //
+                               .replace("[i]", "_").replace("[/i]", "_") //
+                               .replace("[b]", "*").replace("[/b]", "*") //
+                               .replaceAll("\\[[^\\]]*\\]", "");
+               return text;
        }
 }