X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFanfiction.java;h=a73f7dee497142ee3af31212ca04b5c1f52c2211;hp=5f049e456c7d0b5930c01deef11227be9f7ecab5;hb=2284842831ea46e89b97dd22b6e294caad361f30;hpb=333f0e7b5e333e8f6222881ce35398f403fc4121

diff --git a/src/be/nikiroo/fanfix/supported/Fanfiction.java b/src/be/nikiroo/fanfix/supported/Fanfiction.java
index 5f049e4..a73f7de 100644
--- a/src/be/nikiroo/fanfix/supported/Fanfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fanfiction.java
@@ -13,6 +13,7 @@ import java.util.Map.Entry;
 import java.util.Scanner;
 
 import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.StringUtils;
 
@@ -124,6 +125,8 @@ class Fanfiction extends BasicSupport {
 	}
 
 	private String getAuthor(InputStream in) {
+		String author = null;
+
 		int i = 0;
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
@@ -132,12 +135,13 @@ class Fanfiction extends BasicSupport {
 			String line = scan.next();
 			if (line.contains("xcontrast_txt")) {
 				if ((++i) == 3) {
-					return StringUtils.unhtml(line).trim();
+					author = StringUtils.unhtml(line).trim();
+					break;
 				}
 			}
 		}
 
-		return null;
+		return fixAuthor(author);
 	}
 
 	private String getDate(InputStream in) {
@@ -306,7 +310,21 @@ class Fanfiction extends BasicSupport {
 				if (builder.length() == 0) {
 					int pos = line.indexOf("<hr");
 					if (pos >= 0) {
-						line = line.substring(pos);
+						boolean chaptered = false;
+						for (String lang : Instance.getConfig()
+								.getString(Config.CHAPTER).split(",")) {
+							String chapterWord = Instance.getConfig()
+									.getStringX(Config.CHAPTER, lang);
+							int posChap = line.indexOf(chapterWord + " ");
+							if (posChap < pos) {
+								chaptered = true;
+								break;
+							}
+						}
+
+						if (chaptered) {
+							line = line.substring(pos);
+						}
 					}
 				}