X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFanfiction.java;h=0dcd7903e077d2bb6afa268247e04ea39a04722a;hp=5f049e456c7d0b5930c01deef11227be9f7ecab5;hb=8d59ce0748baeeea0458bab49716ab4543aae439;hpb=333f0e7b5e333e8f6222881ce35398f403fc4121

diff --git a/src/be/nikiroo/fanfix/supported/Fanfiction.java b/src/be/nikiroo/fanfix/supported/Fanfiction.java
index 5f049e4..0dcd790 100644
--- a/src/be/nikiroo/fanfix/supported/Fanfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fanfiction.java
@@ -1,11 +1,11 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -13,7 +13,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,17 +26,12 @@ import be.nikiroo.utils.StringUtils;
  * 
  * @author niki
  */
-class Fanfiction extends BasicSupport {
+class Fanfiction extends BasicSupport_Deprecated {
 	@Override
 	protected boolean isHtml() {
 		return true;
 	}
 
-	@Override
-	public String getSourceName() {
-		return "Fanfiction.net";
-	}
-
 	@Override
 	protected MetaData getMeta(URL source, InputStream in) throws IOException {
 		MetaData meta = new MetaData();
@@ -42,12 +40,12 @@ class Fanfiction extends BasicSupport {
 		meta.setAuthor(getAuthor(reset(in)));
 		meta.setDate(getDate(reset(in)));
 		meta.setTags(getTags(reset(in)));
-		meta.setSource(getSourceName());
+		meta.setSource(getType().getSourceName());
 		meta.setUrl(source.toString());
-		meta.setPublisher(getSourceName());
+		meta.setPublisher(getType().getSourceName());
 		meta.setUuid(source.toString());
 		meta.setLuid("");
-		meta.setLang("EN");
+		meta.setLang("en"); // TODO!
 		meta.setSubject(getSubject(reset(in)));
 		meta.setType(getType().toString());
 		meta.setImageDocument(false);
@@ -72,7 +70,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\"";
@@ -120,10 +118,12 @@ class Fanfiction extends BasicSupport {
 			}
 		}
 
-		return null;
+		return "";
 	}
 
 	private String getAuthor(InputStream in) {
+		String author = null;
+
 		int i = 0;
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
@@ -132,12 +132,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 bsHelper.fixAuthor(author);
 	}
 
 	private String getDate(InputStream in) {
@@ -156,8 +157,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 +174,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) {
@@ -206,7 +209,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();
@@ -236,25 +240,14 @@ class Fanfiction extends BasicSupport {
 						}
 
 						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;
-								}
-
-								public String getKey() {
-									return chapName;
-								}
-							});
+							urls.add(new AbstractMap.SimpleEntry<String, URL>(
+									name.trim(), new URL(base + i + suffix)));
 						} catch (MalformedURLException e) {
-							Instance.syserr(new IOException(
-									"Cannot parse chapter " + i + " url: "
-											+ (base + i + suffix), e));
+							Instance.getTraceHandler()
+									.error(new IOException(
+											"Cannot parse chapter " + i
+													+ " url: "
+													+ (base + i + suffix), e));
 						}
 					}
 				}
@@ -264,14 +257,17 @@ class Fanfiction extends BasicSupport {
 			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;
 				}
@@ -282,7 +278,8 @@ class Fanfiction extends BasicSupport {
 	}
 
 	@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";
@@ -306,11 +303,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().getList(
+								Config.CONF_CHAPTER)) {
+							String chapterWord = Instance.getConfig()
+									.getStringX(Config.CONF_CHAPTER, lang);
+							int posChap = line.indexOf(chapterWord + " ");
+							if (posChap < pos) {
+								chaptered = true;
+								break;
+							}
+						}
+
+						if (chaptered) {
+							line = line.substring(pos);
+						}
 					}
 				}
 
 				builder.append(line);
+				builder.append(' ');
 			}
 		}