Code cleanup 3 and update jexer-niki :

[fanfix.git] / src / be / nikiroo / fanfix / Main.java

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index a05df434fb81fdf8edbc57ce391ec78de940678b..adbd5a374bb3f280dd43a6dd6581a61ab0f1e789 100644 (file)
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -8,10 +8,14 @@ import java.net.URL;
 import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.library.LocalLibrary;
+import be.nikiroo.fanfix.library.RemoteLibrary;
+import be.nikiroo.fanfix.library.RemoteLibraryServer;
 import be.nikiroo.fanfix.output.BasicOutput;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.reader.BasicReader;
-import be.nikiroo.fanfix.reader.BasicReader.ReaderType;
+import be.nikiroo.fanfix.reader.Reader;
+import be.nikiroo.fanfix.reader.Reader.ReaderType;
 import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 import be.nikiroo.utils.Progress;
@@ -392,16 +396,17 @@ public class Main {
         */
        private static int read(String story, String chapString, boolean library) {
                try {
-                       BasicReader reader = BasicReader.getReader();
+                       Reader reader = BasicReader.getReader();
                        if (library) {
-                               reader.setStory(story, null);
+                               reader.setMeta(story);
                        } else {
-                               reader.setStory(BasicReader.getUrl(story), null);
+                               reader.setMeta(BasicReader.getUrl(story), null);
                        }
 
                        if (chapString != null) {
                                try {
-                                       reader.read(Integer.parseInt(chapString));
+                                       reader.setChapter(Integer.parseInt(chapString));
+                                       reader.read();
                                } catch (NumberFormatException e) {
                                        Instance.syserr(new IOException(
                                                        "Chapter number cannot be parsed: " + chapString, e));