X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFimfiction.java;h=b5df2618ce671ddaf04d7f5b644c3110c721339b;hp=03a7cc21dc7f94643326e7baa37c35ec860f121f;hb=cfdaf6052ddc5ca44cf19f1f6d9f154cc8443024;hpb=2206ef66ee00ad42d806f04a7b7ad6f8cb2d8828

diff --git a/src/be/nikiroo/fanfix/supported/Fimfiction.java b/src/be/nikiroo/fanfix/supported/Fimfiction.java
index 03a7cc2..b5df261 100644
--- a/src/be/nikiroo/fanfix/supported/Fimfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fimfiction.java
@@ -1,10 +1,10 @@
 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.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -14,6 +14,8 @@ import java.util.Scanner;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.utils.Image;
+import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -22,17 +24,12 @@ import be.nikiroo.utils.StringUtils;
  * 
  * @author niki
  */
-class Fimfiction extends BasicSupport {
+class Fimfiction extends BasicSupport_Deprecated {
 	@Override
 	protected boolean isHtml() {
 		return true;
 	}
 
-	@Override
-	public String getSourceName() {
-		return "FimFiction.net";
-	}
-
 	@Override
 	protected MetaData getMeta(URL source, InputStream in) throws IOException {
 		MetaData meta = new MetaData();
@@ -41,14 +38,11 @@ class Fimfiction extends BasicSupport {
 		meta.setAuthor(getAuthor(reset(in)));
 		meta.setDate(getDate(reset(in)));
 		meta.setTags(getTags(reset(in)));
-		meta.setSource(getSourceName());
 		meta.setUrl(source.toString());
-		meta.setPublisher(getSourceName());
 		meta.setUuid(source.toString());
 		meta.setLuid("");
-		meta.setLang("EN");
+		meta.setLang("en");
 		meta.setSubject("MLP");
-		meta.setType(getType().toString());
 		meta.setImageDocument(false);
 		meta.setCover(getCover(reset(in)));
 
@@ -69,22 +63,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();
 			}
 		}
 
@@ -155,12 +163,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) {
+	private Image 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) {
@@ -172,58 +180,55 @@ class Fimfiction extends BasicSupport {
 			}
 		}
 
-		return getImage(null, cover);
+		return getImage(this, null, cover);
 	}
 
 	@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>>();
 		@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('<');
-					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('"');
-					if (pos >= 0) {
-						line = line.substring(0, pos);
-					}
+			String line = scan.next().trim();
+
+			if (!started) {
+				started = line.equals("<!--Chapters-->");
+			} else {
+				if (line.equals("</form>")) {
+					break;
 				}
 
-				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;
+				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(pos + 1);
+						pos = name.indexOf('<');
+						if (pos >= 0) {
+							name = name.substring(0, pos);
 						}
-
-						public String getKey() {
-							return key;
+					}
+					// Chapter content
+					pos = line.indexOf('/');
+					if (pos >= 0) {
+						line = line.substring(pos); // we take the /, not +1
+						pos = line.indexOf('"');
+						if (pos >= 0) {
+							line = line.substring(0, pos);
 						}
+					}
 
-						public URL getValue() {
-							return value;
-						}
-					});
-				} catch (MalformedURLException e) {
-					Instance.syserr(e);
+					try {
+						urls.add(new AbstractMap.SimpleEntry<String, URL>(name,
+								new URL("http://www.fimfiction.net" + line)));
+					} catch (MalformedURLException e) {
+						Instance.getInstance().getTraceHandler().error(e);
+					}
 				}
 			}
 		}
@@ -232,8 +237,9 @@ class Fimfiction extends BasicSupport {
 	}
 
 	@Override
-	protected String getChapterContent(URL source, InputStream in, int number) {
-		return getLine(in, "<div id=\"chapter_container\">", 1);
+	protected String getChapterContent(URL source, InputStream in, int number,
+			Progress pg) {
+		return getLine(in, "<div class=\"bbcode\">", 1);
 	}
 
 	@Override