X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFimfiction.java;h=cb26ac6fc42939682ff716d987e305f4aa720ef6;hp=6293c1147f5530a058d59381bf9fb153aebf660f;hb=211f7ddb50f68aa8a999023ef6d63d5756bdace6;hpb=ed08c17162aa8cbdb0cbe6a6045815b987236b9f

diff --git a/src/be/nikiroo/fanfix/supported/Fimfiction.java b/src/be/nikiroo/fanfix/supported/Fimfiction.java
index 6293c11..cb26ac6 100644
--- a/src/be/nikiroo/fanfix/supported/Fimfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fimfiction.java
@@ -70,22 +70,36 @@ class Fimfiction extends BasicSupport {
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
 		scan.useDelimiter("\\n");
+		boolean started = false;
 		while (scan.hasNext()) {
 			String line = scan.next();
-			if (line.contains("story_category") && !line.contains("title=")) {
-				int pos = line.indexOf('>');
-				if (pos >= 0) {
-					line = line.substring(pos + 1);
-					pos = line.indexOf('<');
-					if (pos >= 0) {
-						line = line.substring(0, pos);
-					}
+
+			if (!started) {
+				started = line.contains("\"story_container\"");
+			}
+
+			if (started && line.contains("class=\"tag-")) {
+				if (line.contains("index.php")) {
+					break; // end of *this story* tags
 				}
 
-				line = line.trim();
-				if (!tags.contains(line)) {
-					tags.add(line);
+				String keyword = "title=\"";
+				Scanner tagScanner = new Scanner(line);
+				tagScanner.useDelimiter(keyword);
+				if (tagScanner.hasNext()) {
+					tagScanner.next();// Ignore first one
 				}
+				while (tagScanner.hasNext()) {
+					String tag = tagScanner.next();
+					if (tag.contains("\"")) {
+						tag = tag.split("\"")[0];
+						tag = StringUtils.unhtml(tag).trim();
+						if (!tag.isEmpty() && !tags.contains(tag)) {
+							tags.add(tag);
+						}
+					}
+				}
+				tagScanner.close();
 			}
 		}
 
@@ -156,12 +170,12 @@ class Fimfiction extends BasicSupport {
 	@Override
 	protected String getDesc(URL source, InputStream in) {
 		// the og: meta version is the SHORT resume, this is the LONG resume
-		return getLine(in, "class=\"more_button hidden\"", -1);
+		return getLine(in, "class=\"description-text bbcode\"", 1);
 	}
 
 	private BufferedImage getCover(InputStream in) {
 		// Note: the 'og:image' is the SMALL cover, not the full version
-		String cover = getLine(in, "<div class=\"story_image\">", 1);
+		String cover = getLine(in, "class=\"story_container__story_image\"", 1);
 		if (cover != null) {
 			int pos = cover.indexOf('"');
 			if (pos >= 0) {
@@ -183,49 +197,62 @@ class Fimfiction extends BasicSupport {
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
 		scan.useDelimiter("\\n");
+		boolean started = false;
 		while (scan.hasNext()) {
-			String line = scan.next();
-			if (line.contains("class=\"chapter_link\"")
-					|| line.contains("class='chapter_link'")) {
-				// Chapter name
-				String name = line;
-				int pos = name.indexOf('>');
-				if (pos >= 0) {
-					name = name.substring(pos + 1);
-					pos = name.indexOf('<');
+			String line = scan.next().trim();
+
+			if (!started) {
+				started = line.equals("<!--Chapters-->");
+			} else {
+				if (line.equals("</form>")) {
+					break;
+				}
+
+				if (line.startsWith("<a href=")
+						|| line.contains("class=\"chapter-title\"")) {
+					// Chapter name
+					String name = line;
+					int pos = name.indexOf('>');
 					if (pos >= 0) {
-						name = name.substring(0, pos);
+						name = name.substring(pos + 1);
+						pos = name.indexOf('<');
+						if (pos >= 0) {
+							name = name.substring(0, pos);
+						}
 					}
-				}
-				// Chapter content
-				pos = line.indexOf('/');
-				if (pos >= 0) {
-					line = line.substring(pos); // we take the /, not +1
-					pos = line.indexOf('"');
+					// Chapter content
+					pos = line.indexOf('/');
 					if (pos >= 0) {
-						line = line.substring(0, pos);
+						line = line.substring(pos); // we take the /, not +1
+						pos = line.indexOf('"');
+						if (pos >= 0) {
+							line = line.substring(0, pos);
+						}
 					}
-				}
 
-				try {
-					final String key = name;
-					final URL value = new URL("http://www.fimfiction.net"
-							+ line);
-					urls.add(new Entry<String, URL>() {
-						public URL setValue(URL value) {
-							return null;
-						}
+					try {
+						final String key = name;
+						final URL value = new URL("http://www.fimfiction.net"
+								+ line);
+						urls.add(new Entry<String, URL>() {
+							@Override
+							public URL setValue(URL value) {
+								return null;
+							}
 
-						public String getKey() {
-							return key;
-						}
+							@Override
+							public String getKey() {
+								return key;
+							}
 
-						public URL getValue() {
-							return value;
-						}
-					});
-				} catch (MalformedURLException e) {
-					Instance.syserr(e);
+							@Override
+							public URL getValue() {
+								return value;
+							}
+						});
+					} catch (MalformedURLException e) {
+						Instance.syserr(e);
+					}
 				}
 			}
 		}
@@ -236,7 +263,7 @@ class Fimfiction extends BasicSupport {
 	@Override
 	protected String getChapterContent(URL source, InputStream in, int number,
 			Progress pg) {
-		return getLine(in, "<div id=\"chapter_container\">", 1);
+		return getLine(in, "<div class=\"bbcode\">", 1);
 	}
 
 	@Override