X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FE621.java;h=5fe99a8fe0db698f02586af65b7e90643a8fa345;hb=0ffa47548f474c1330d8d723300d9aa7a4894736;hp=cde7f0a45045db5239e6155f44a265c12a59e9b1;hpb=3b2b638f7e1395702f843b5b19d7959327f604b2;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index cde7f0a..5fe99a8 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.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.URL;
@@ -13,6 +12,7 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
 
@@ -26,7 +26,7 @@ import be.nikiroo.utils.StringUtils;
  * 
  * @author niki
  */
-class E621 extends BasicSupport {
+class E621 extends BasicSupport_Deprecated {
 	@Override
 	public String getSourceName() {
 		return "e621.net";
@@ -46,10 +46,11 @@ class E621 extends BasicSupport {
 		meta.setUuid(source.toString());
 		meta.setLuid("");
 		meta.setLang("EN");
-		meta.setSubject("");
+		meta.setSubject("Furry");
 		meta.setType(getType().toString());
 		meta.setImageDocument(true);
 		meta.setCover(getCover(source));
+		meta.setFakeCover(true);
 
 		return meta;
 	}
@@ -86,12 +87,12 @@ class E621 extends BasicSupport {
 		return true;
 	}
 
-	private BufferedImage getCover(URL source) throws IOException {
+	private Image getCover(URL source) throws IOException {
 		InputStream in = Instance.getCache().open(source, this, true);
 		String images = getChapterContent(new URL(source.toString() + "?page="
-				+ 1), in, 1);
+				+ 1), in, 1, null);
 		if (!images.isEmpty()) {
-			int pos = images.indexOf('\n');
+			int pos = images.indexOf("<br/>");
 			if (pos >= 0) {
 				images = images.substring(1, pos - 1);
 				return getImage(this, null, images);
@@ -101,7 +102,7 @@ class E621 extends BasicSupport {
 		return null;
 	}
 
-	private String getAuthor(URL source, InputStream in) throws IOException {
+	private String getAuthor(URL source, InputStream in) {
 		String author = getLine(in, "href=\"/post/show/", 0);
 		if (author != null) {
 			String key = "href=\"";
@@ -143,7 +144,7 @@ class E621 extends BasicSupport {
 		return null;
 	}
 
-	private String getTitle(InputStream in) throws IOException {
+	private String getTitle(InputStream in) {
 		String title = getLine(in, "<title>", 0);
 		if (title != null) {
 			int pos = title.indexOf('>');
@@ -190,8 +191,8 @@ class E621 extends BasicSupport {
 	}
 
 	@Override
-	protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-			throws IOException {
+	protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+			Progress pg) throws IOException {
 		List<Entry<String, URL>> urls = new ArrayList<Entry<String, URL>>();
 		int last = 1; // no pool/show when only one page
 
@@ -221,14 +222,17 @@ class E621 extends BasicSupport {
 			final String key = Integer.toString(i);
 			final URL value = new URL(source.toString() + "?page=" + i);
 			urls.add(new Entry<String, URL>() {
+				@Override
 				public URL setValue(URL value) {
 					return null;
 				}
 
+				@Override
 				public URL getValue() {
 					return value;
 				}
 
+				@Override
 				public String getKey() {
 					return key;
 				}
@@ -239,8 +243,8 @@ class E621 extends BasicSupport {
 	}
 
 	@Override
-	protected String getChapterContent(URL source, InputStream in, int number)
-			throws IOException {
+	protected String getChapterContent(URL source, InputStream in, int number,
+			Progress pg) throws IOException {
 		StringBuilder builder = new StringBuilder();
 		String staticSite = "https://static1.e621.net";
 		if (source.getHost().contains("e926")) {
@@ -267,7 +271,7 @@ class E621 extends BasicSupport {
 							id = id.substring(0, dotPos);
 							builder.append("[");
 							builder.append(id);
-							builder.append("]\n");
+							builder.append("]<br/>");
 						}
 					}
 				}