X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FMangaFox.java;h=8fc1965dfe20839fe9c406a07f12ad52c3a5527a;hb=0ffa47548f474c1330d8d723300d9aa7a4894736;hp=c8eaa1d3035d0fabee3af3ccd2a797ec080a7cce;hpb=326093dc53fa48019c94f59bd006b307d755b392;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/MangaFox.java b/src/be/nikiroo/fanfix/supported/MangaFox.java
index c8eaa1d..8fc1965 100644
--- a/src/be/nikiroo/fanfix/supported/MangaFox.java
+++ b/src/be/nikiroo/fanfix/supported/MangaFox.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,11 +12,11 @@ import java.util.Scanner;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
-import be.nikiroo.utils.ImageUtils;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
 
-class MangaFox extends BasicSupport {
+class MangaFox extends BasicSupport_Deprecated {
 	@Override
 	protected boolean isHtml() {
 		return true;
@@ -103,7 +102,7 @@ class MangaFox extends BasicSupport {
 		try {
 			in.reset();
 		} catch (IOException e) {
-			Instance.syserr(e);
+			Instance.getTraceHandler().error(e);
 		}
 
 		line = getLine(in, "/artist/", 0, false);
@@ -118,18 +117,18 @@ class MangaFox extends BasicSupport {
 
 		if (authors.isEmpty()) {
 			return null;
-		} else {
-			StringBuilder builder = new StringBuilder();
-			for (String author : authors) {
-				if (builder.length() > 0) {
-					builder.append(", ");
-				}
+		}
 
-				builder.append(author);
+		StringBuilder builder = new StringBuilder();
+		for (String author : authors) {
+			if (builder.length() > 0) {
+				builder.append(", ");
 			}
 
-			return builder.toString();
+			builder.append(author);
 		}
+
+		return builder.toString();
 	}
 
 	private String getDate(InputStream in) {
@@ -163,7 +162,7 @@ class MangaFox extends BasicSupport {
 		return null;
 	}
 
-	private BufferedImage getCover(InputStream in) {
+	private Image getCover(InputStream in) {
 		String line = getLine(in, " property=\"og:image\"", 0);
 		String cover = null;
 		if (line != null) {
@@ -186,7 +185,7 @@ class MangaFox extends BasicSupport {
 			try {
 				coverIn = openEx(cover);
 				try {
-					return ImageUtils.fromStream(coverIn);
+					return new Image(coverIn);
 				} finally {
 					coverIn.close();
 				}
@@ -246,20 +245,23 @@ class MangaFox extends BasicSupport {
 					final String key = name;
 					final URL value = new URL(url);
 					urls.add(new Entry<String, URL>() {
+						@Override
 						public URL setValue(URL value) {
 							return null;
 						}
 
+						@Override
 						public String getKey() {
 							return key;
 						}
 
+						@Override
 						public URL getValue() {
 							return value;
 						}
 					});
 				} catch (MalformedURLException e) {
-					Instance.syserr(e);
+					Instance.getTraceHandler().error(e);
 				}
 			}
 		}
@@ -306,7 +308,7 @@ class MangaFox extends BasicSupport {
 			try {
 				in.reset();
 			} catch (IOException e) {
-				Instance.syserr(e);
+				Instance.getTraceHandler().error(e);
 			}
 
 			String linkImageLine = getLine(in, "return enlarge()", 1);
@@ -345,7 +347,7 @@ class MangaFox extends BasicSupport {
 				try {
 					in.close();
 				} catch (IOException e) {
-					Instance.syserr(e);
+					Instance.getTraceHandler().error(e);
 				}
 			}
 
@@ -358,9 +360,10 @@ class MangaFox extends BasicSupport {
 					setCurrentReferer(url);
 					pg.setProgress((i++) % pg.getMax());
 				} catch (IOException e) {
-					Instance.syserr(new IOException(
-							"Cannot get the next manga page which is: "
-									+ linkNext, e));
+					Instance.getTraceHandler().error(
+							new IOException(
+									"Cannot get the next manga page which is: "
+											+ linkNext, e));
 				}
 			}
 
@@ -373,6 +376,9 @@ class MangaFox extends BasicSupport {
 
 	@Override
 	protected boolean supports(URL url) {
+		// Broken code (see MangaFoxNew)
+		if (true)
+			return false;
 		return "mangafox.me".equals(url.getHost())
 				|| "www.mangafox.me".equals(url.getHost());
 	}