X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFanfiction.java;h=060705cadd09ea0867c1152245a0bd90697fac6f;hb=cfdaf6052ddc5ca44cf19f1f6d9f154cc8443024;hp=10c82fc522c26cf24fe6936972a97852f9956825;hpb=b7cd9db81ba27c67fdd8dd5a42b5f9e4137622db;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Fanfiction.java b/src/be/nikiroo/fanfix/supported/Fanfiction.java
index 10c82fc..060705c 100644
--- a/src/be/nikiroo/fanfix/supported/Fanfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fanfiction.java
@@ -40,14 +40,11 @@ class Fanfiction extends BasicSupport_Deprecated {
 		meta.setAuthor(getAuthor(reset(in)));
 		meta.setDate(getDate(reset(in)));
 		meta.setTags(getTags(reset(in)));
-		meta.setSource(getType().getSourceName());
 		meta.setUrl(source.toString());
-		meta.setPublisher(getType().getSourceName());
 		meta.setUuid(source.toString());
 		meta.setLuid("");
-		meta.setLang("en"); // TODO!
+		meta.setLang("en"); // TODO find language of book
 		meta.setSubject(getSubject(reset(in)));
-		meta.setType(getType().toString());
 		meta.setImageDocument(false);
 		meta.setCover(getCover(source, reset(in)));
 
@@ -138,7 +135,7 @@ class Fanfiction extends BasicSupport_Deprecated {
 			}
 		}
 
-		return BasicSupportHelper.fixAuthor(author);
+		return bsHelper.fixAuthor(author);
 	}
 
 	private String getDate(InputStream in) {
@@ -153,14 +150,12 @@ class Fanfiction extends BasicSupport_Deprecated {
 					line = line.substring(0, pos).trim();
 					try {
 						SimpleDateFormat sdf = new SimpleDateFormat(
-								"YYYY-MM-dd");
+								"yyyy-MM-dd");
 						return sdf
 								.format(new Date(1000 * Long.parseLong(line)));
 					} catch (NumberFormatException e) {
-						Instance.getTraceHandler().error(
-								new IOException(
-										"Cannot convert publication date: "
-												+ line, e));
+						Instance.getInstance().getTraceHandler()
+								.error(new IOException("Cannot convert publication date: " + line, e));
 					}
 				}
 			}
@@ -243,11 +238,8 @@ class Fanfiction extends BasicSupport_Deprecated {
 							urls.add(new AbstractMap.SimpleEntry<String, URL>(
 									name.trim(), new URL(base + i + suffix)));
 						} catch (MalformedURLException e) {
-							Instance.getTraceHandler()
-									.error(new IOException(
-											"Cannot parse chapter " + i
-													+ " url: "
-													+ (base + i + suffix), e));
+							Instance.getInstance().getTraceHandler().error(
+									new IOException("Cannot parse chapter " + i + " url: " + (base + i + suffix), e));
 						}
 					}
 				}
@@ -304,10 +296,9 @@ class Fanfiction extends BasicSupport_Deprecated {
 					int pos = line.indexOf("<hr");
 					if (pos >= 0) {
 						boolean chaptered = false;
-						for (String lang : Instance.getConfig().getList(
-								Config.CHAPTER)) {
-							String chapterWord = Instance.getConfig()
-									.getStringX(Config.CHAPTER, lang);
+						for (String lang : Instance.getInstance().getConfig().getList(Config.CONF_CHAPTER)) {
+							String chapterWord = Instance.getInstance().getConfig().getStringX(Config.CONF_CHAPTER,
+									lang);
 							int posChap = line.indexOf(chapterWord + " ");
 							if (posChap < pos) {
 								chaptered = true;