X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFimfiction.java;h=08d1712e9f4aa2ccebb8f8e07e1bb49085340bc4;hb=refs%2Ftags%2Ffanfix-1.5.3;hp=1faf615207154501361164721d7be8a2178855a9;hpb=83f66cbbd12246a5e2f1aeee1afe36503b901814;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Fimfiction.java b/src/be/nikiroo/fanfix/supported/Fimfiction.java
index 1faf615..08d1712 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();
 			}
 		}
 
@@ -194,7 +208,8 @@ class Fimfiction extends BasicSupport {
 					break;
 				}
 
-				if (line.startsWith("<a href=")) {
+				if (line.startsWith("<a href=")
+						|| line.contains("class=\"chapter-title\"")) {
 					// Chapter name
 					String name = line;
 					int pos = name.indexOf('>');