X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFanfiction.java;h=0feb9641be2f2ea85f896c9b21da2511c6d3a8b5;hb=0ffa47548f474c1330d8d723300d9aa7a4894736;hp=2cbe696052dc16ec61e3ba333ac50c8180486aaf;hpb=2206ef66ee00ad42d806f04a7b7ad6f8cb2d8828;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Fanfiction.java b/src/be/nikiroo/fanfix/supported/Fanfiction.java
index 2cbe696..0feb964 100644
--- a/src/be/nikiroo/fanfix/supported/Fanfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fanfiction.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -13,7 +12,10 @@ 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.Image;
+import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -23,7 +25,7 @@ import be.nikiroo.utils.StringUtils;
  * 
  * @author niki
  */
-class Fanfiction extends BasicSupport {
+class Fanfiction extends BasicSupport_Deprecated {
 	@Override
 	protected boolean isHtml() {
 		return true;
@@ -72,7 +74,7 @@ class Fanfiction extends BasicSupport {
 		return null;
 	}
 
-	private List<String> getTags(InputStream in) throws IOException {
+	private List<String> getTags(InputStream in) {
 		List<String> tags = new ArrayList<String>();
 
 		String key = "title=\"Send Private Message\"";
@@ -124,6 +126,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 +136,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 BasicSupportHelper.fixAuthor(author);
 	}
 
 	private String getDate(InputStream in) {
@@ -156,8 +161,10 @@ class Fanfiction extends BasicSupport {
 						return sdf
 								.format(new Date(1000 * Long.parseLong(line)));
 					} catch (NumberFormatException e) {
-						Instance.syserr(new IOException(
-								"Cannot convert publication date: " + line, e));
+						Instance.getTraceHandler().error(
+								new IOException(
+										"Cannot convert publication date: "
+												+ line, e));
 					}
 				}
 			}
@@ -171,7 +178,7 @@ class Fanfiction extends BasicSupport {
 		return getLine(in, "title=\"Send Private Message\"", 1);
 	}
 
-	private BufferedImage getCover(URL url, InputStream in) {
+	private Image getCover(URL url, InputStream in) {
 		String key = "class='cimage";
 		String line = getLine(in, key, 0);
 		if (line != null) {
@@ -196,7 +203,7 @@ class Fanfiction extends BasicSupport {
 									+ "/" + url.getPath() + "/" + line;
 						}
 
-						return getImage(null, line);
+						return getImage(this, null, line);
 					}
 				}
 			}
@@ -206,7 +213,8 @@ class Fanfiction extends BasicSupport {
 	}
 
 	@Override
-	protected List<Entry<String, URL>> getChapters(URL source, InputStream in) {
+	protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+			Progress pg) {
 		List<Entry<String, URL>> urls = new ArrayList<Entry<String, URL>>();
 
 		String base = source.toString();
@@ -220,46 +228,78 @@ class Fanfiction extends BasicSupport {
 		String line = getLine(in, "id=chap_select", 0);
 		String key = "<option  value=";
 		int i = 1;
-		for (pos = line.indexOf(key); pos >= 0; pos = line.indexOf(key, pos), i++) {
-			pos = line.indexOf('>', pos);
-			if (pos >= 0) {
-				int endOfName = line.indexOf('<', pos);
-				if (endOfName >= 0) {
-					String name = line.substring(pos + 1, endOfName);
-					String chapNum = i + ".";
-					if (name.startsWith(chapNum)) {
-						name = name.substring(chapNum.length(), name.length());
-					}
-
-					try {
-						final String chapName = name.trim();
-						final URL chapURL = new URL(base + i + suffix);
-						urls.add(new Entry<String, URL>() {
-							public URL setValue(URL value) {
-								return null;
-							}
 
-							public URL getValue() {
-								return chapURL;
-							}
+		if (line != null) {
+			for (pos = line.indexOf(key); pos >= 0; pos = line
+					.indexOf(key, pos), i++) {
+				pos = line.indexOf('>', pos);
+				if (pos >= 0) {
+					int endOfName = line.indexOf('<', pos);
+					if (endOfName >= 0) {
+						String name = line.substring(pos + 1, endOfName);
+						String chapNum = i + ".";
+						if (name.startsWith(chapNum)) {
+							name = name.substring(chapNum.length(),
+									name.length());
+						}
 
-							public String getKey() {
-								return chapName;
-							}
-						});
-					} catch (MalformedURLException e) {
-						Instance.syserr(new IOException("Cannot parse chapter "
-								+ i + " url: " + (base + i + suffix), e));
+						try {
+							final String chapName = name.trim();
+							final URL chapURL = new URL(base + i + suffix);
+							urls.add(new Entry<String, URL>() {
+								@Override
+								public URL setValue(URL value) {
+									return null;
+								}
+
+								@Override
+								public URL getValue() {
+									return chapURL;
+								}
+
+								@Override
+								public String getKey() {
+									return chapName;
+								}
+							});
+						} catch (MalformedURLException e) {
+							Instance.getTraceHandler()
+									.error(new IOException(
+											"Cannot parse chapter " + i
+													+ " url: "
+													+ (base + i + suffix), e));
+						}
 					}
 				}
 			}
+		} else {
+			// only one chapter:
+			final String chapName = getTitle(reset(in));
+			final URL chapURL = source;
+			urls.add(new Entry<String, URL>() {
+				@Override
+				public URL setValue(URL value) {
+					return null;
+				}
+
+				@Override
+				public URL getValue() {
+					return chapURL;
+				}
+
+				@Override
+				public String getKey() {
+					return chapName;
+				}
+			});
 		}
 
 		return urls;
 	}
 
 	@Override
-	protected String getChapterContent(URL source, InputStream in, int number) {
+	protected String getChapterContent(URL source, InputStream in, int number,
+			Progress pg) {
 		StringBuilder builder = new StringBuilder();
 		String startAt = "class='storytext ";
 		String endAt1 = "function review_init";
@@ -283,11 +323,26 @@ 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);
+						}
 					}
 				}
 
 				builder.append(line);
+				builder.append(' ');
 			}
 		}