Merge branch 'master' into subtree

[nikiroo-utils.git] / supported / Fanfiction.java

diff --git a/supported/Fanfiction.java b/supported/Fanfiction.java
index fcf773bd78b787693cd3afa28febd8502f997fc6..060705cadd09ea0867c1152245a0bd90697fac6f 100644 (file)
--- a/supported/Fanfiction.java
+++ b/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)));
 
@@ -157,10 +154,8 @@ class Fanfiction extends BasicSupport_Deprecated {
                                                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.CONF_CHAPTER)) {
-                                                       String chapterWord = Instance.getConfig()
-                                                                       .getStringX(Config.CONF_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;