X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFanfiction.java;h=43f16c89b0c2526289721db103bac3308acb5c5b;hb=62c63b0724f4bc45999cb2e7186b4b3ada479a0a;hp=90736567adbd70a43ae2afc16ca42671424be04e;hpb=406447a4c017f2a4592429a67d546a6984460617;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Fanfiction.java b/src/be/nikiroo/fanfix/supported/Fanfiction.java
index 9073656..43f16c8 100644
--- a/src/be/nikiroo/fanfix/supported/Fanfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fanfiction.java
@@ -15,6 +15,7 @@ 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.Progress;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -73,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\"";
@@ -160,7 +161,7 @@ class Fanfiction extends BasicSupport {
 						return sdf
 								.format(new Date(1000 * Long.parseLong(line)));
 					} catch (NumberFormatException e) {
-						Instance.syserr(new IOException(
+						Instance.getTraceHandler().error(new IOException(
 								"Cannot convert publication date: " + line, e));
 					}
 				}
@@ -210,7 +211,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();
@@ -243,20 +245,23 @@ class Fanfiction extends BasicSupport {
 							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.syserr(new IOException(
+							Instance.getTraceHandler().error(new IOException(
 									"Cannot parse chapter " + i + " url: "
 											+ (base + i + suffix), e));
 						}
@@ -268,14 +273,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;
 				}
@@ -286,7 +294,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";