X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=99ac119dd3a864d1e77e486a839f99083727789a;hb=99ccbdf63b539f1f40e070f5833f2d15fcf79830;hp=a05df434fb81fdf8edbc57ce391ec78de940678b;hpb=68e2c6d20049d713de1bd31b749450b2f60d8340;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index a05df43..99ac119 100644
--- 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;
@@ -195,6 +199,7 @@ public class Main {
 		mainProgress.addProgressListener(new Progress.ProgressListener() {
 			private int current = mainProgress.getMin();
 
+			@Override
 			public void progress(Progress progress, String name) {
 				int diff = progress.getProgress() - current;
 				current += diff;
@@ -248,12 +253,30 @@ public class Main {
 				updates.ok(); // we consider it read
 				break;
 			case LIST:
+				if (BasicReader.getReader() == null) {
+					Instance.syserr(new Exception(
+							"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
 				exitCode = list(sourceString);
 				break;
 			case READ:
+				if (BasicReader.getReader() == null) {
+					Instance.syserr(new Exception(
+							"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
 				exitCode = read(luid, chapString, true);
 				break;
 			case READ_URL:
+				if (BasicReader.getReader() == null) {
+					Instance.syserr(new Exception(
+							"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
 				exitCode = read(urlString, chapString, false);
 				break;
 			case HELP:
@@ -272,6 +295,12 @@ public class Main {
 				updates.ok(); // we consider it read
 				break;
 			case START:
+				if (BasicReader.getReader() == null) {
+					Instance.syserr(new Exception(
+							"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
 				BasicReader.getReader().browse(null);
 				break;
 			case SERVER:
@@ -288,7 +317,7 @@ public class Main {
 				}
 				return;
 			case REMOTE:
-				exitCode = 255;
+				exitCode = 255; // should not be reachable (REMOTE -> START)
 				break;
 			}
 		}
@@ -392,16 +421,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));