X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=c17a1d8b988f0a52c7c763efd9bad67f48bebd92;hb=e604986c4208da0091d26bc0e1c4feb4ff3c588f;hp=38f58af3814fcc484f966112af59ec4f96618129;hpb=b0e88ebd20f8b2950c382694e936da76ac3596b6;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 38f58af..c17a1d8 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;
@@ -181,12 +185,8 @@ public class Main {
 					host = args[i];
 				} else if (port == null) {
 					port = Integer.parseInt(args[i]);
-					try {
-						BasicReader.setDefaultLibrary(new RemoteLibrary(host,
-								port));
-					} catch (IOException e) {
-						Instance.syserr(e);
-					}
+					BasicReader
+							.setDefaultLibrary(new RemoteLibrary(host, port));
 					action = MainAction.START;
 				} else {
 					exitCode = 255;
@@ -199,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;
@@ -252,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:
@@ -276,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:
@@ -292,7 +317,7 @@ public class Main {
 				}
 				return;
 			case REMOTE:
-				exitCode = 255;
+				exitCode = 255; // should not be reachable (REMOTE -> START)
 				break;
 			}
 		}
@@ -307,7 +332,7 @@ public class Main {
 	}
 
 	/**
-	 * Import the given resource into the {@link Library}.
+	 * Import the given resource into the {@link LocalLibrary}.
 	 * 
 	 * @param urlString
 	 *            the resource to import
@@ -331,7 +356,8 @@ public class Main {
 	}
 
 	/**
-	 * Export the {@link Story} from the {@link Library} to the given target.
+	 * Export the {@link Story} from the {@link LocalLibrary} to the given
+	 * target.
 	 * 
 	 * @param luid
 	 *            the story LUID
@@ -346,7 +372,7 @@ public class Main {
 	 */
 	public static int export(String luid, String typeString, String target,
 			Progress pg) {
-		OutputType type = OutputType.valueOfNullOkUC(typeString);
+		OutputType type = OutputType.valueOfNullOkUC(typeString, null);
 		if (type == null) {
 			Instance.syserr(new Exception(trans(StringId.OUTPUT_DESC,
 					typeString)));
@@ -364,8 +390,8 @@ public class Main {
 	}
 
 	/**
-	 * List the stories of the given source from the {@link Library} (unless
-	 * NULL is passed, in which case all stories will be listed).
+	 * List the stories of the given source from the {@link LocalLibrary}
+	 * (unless NULL is passed, in which case all stories will be listed).
 	 * 
 	 * @param source
 	 *            the source to list the known stories of, or NULL to list all
@@ -382,8 +408,8 @@ public class Main {
 	 * Start the CLI reader for this {@link Story}.
 	 * 
 	 * @param story
-	 *            the LUID of the {@link Story} in the {@link Library} <b>or</b>
-	 *            the {@link Story} {@link URL}
+	 *            the LUID of the {@link Story} in the {@link LocalLibrary}
+	 *            <b>or</b> the {@link Story} {@link URL}
 	 * @param chapString
 	 *            which {@link Chapter} to read (starting at 1), or NULL to get
 	 *            the {@link Story} description
@@ -395,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));
@@ -450,7 +477,7 @@ public class Main {
 				sourceName = sourceName.substring("file://".length());
 			}
 
-			OutputType type = OutputType.valueOfAllOkUC(typeString);
+			OutputType type = OutputType.valueOfAllOkUC(typeString, null);
 			if (type == null) {
 				Instance.syserr(new IOException(trans(
 						StringId.ERR_BAD_OUTPUT_TYPE, typeString)));