X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=46eb0b5ab9fc08becb2b55924aa9ef2bb6b9f092;hp=10bccec650d7e4f9f33073502f553860e5f4229a;hb=a6395bef99a8e917f67341ef1906917b87df24a4;hpb=d011400048cae6884f0d94c320498429b45fb48a

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 10bccec..46eb0b5 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -62,8 +62,7 @@ public class Main {
 		String typeString = null;
 		String chapString = null;
 		String target = null;
-		String readerTypeString = null;
-		MainAction action = null;
+		MainAction action = MainAction.HELP;
 		Boolean plusInfo = null;
 
 		boolean noMoreActions = false;
@@ -153,11 +152,7 @@ public class Main {
 				exitCode = 255;
 				break;
 			case SET_READER:
-				if (readerTypeString == null) {
-					readerTypeString = args[i];
-				} else {
-					exitCode = 255;
-				}
+				exitCode = setReaderType(args[i]);
 				break;
 			}
 		}
@@ -168,7 +163,7 @@ public class Main {
 				exitCode = imprt(urlString);
 				break;
 			case EXPORT:
-				exitCode = export(urlString, typeString, target);
+				exitCode = export(luid, typeString, target);
 				break;
 			case CONVERT:
 				exitCode = convert(urlString, typeString, target,
@@ -188,7 +183,6 @@ public class Main {
 				exitCode = 0;
 				break;
 			case SET_READER:
-				exitCode = setReaderType(readerTypeString);
 				break;
 			}
 		}
@@ -254,7 +248,7 @@ public class Main {
 	/**
 	 * Export the {@link Story} from the {@link Library} to the given target.
 	 * 
-	 * @param urlString
+	 * @param luid
 	 *            the story LUID
 	 * @param typeString
 	 *            the {@link OutputType} to use
@@ -263,7 +257,7 @@ public class Main {
 	 * 
 	 * @return the exit return code (0 = success)
 	 */
-	private static int export(String urlString, String typeString, String target) {
+	private static int export(String luid, String typeString, String target) {
 		OutputType type = OutputType.valueOfNullOkUC(typeString);
 		if (type == null) {
 			Instance.syserr(new Exception(trans(StringId.OUTPUT_DESC,
@@ -272,9 +266,7 @@ public class Main {
 		}
 
 		try {
-			Story story = Instance.getLibrary().imprt(new URL(urlString));
-			Instance.getLibrary().export(story.getMeta().getLuid(), type,
-					target);
+			Instance.getLibrary().export(luid, type, target);
 		} catch (IOException e) {
 			Instance.syserr(e);
 			return 4;
@@ -387,6 +379,7 @@ public class Main {
 			} else {
 				try {
 					BasicSupport support = BasicSupport.getSupport(source);
+					
 					if (support != null) {
 						Story story = support.process(source);
 
@@ -474,7 +467,8 @@ public class Main {
 	 */
 	private static int setReaderType(String readerTypeString) {
 		try {
-			ReaderType readerType = ReaderType.valueOf(readerTypeString);
+			ReaderType readerType = ReaderType.valueOf(readerTypeString
+					.toUpperCase());
 			BasicReader.setDefaultReaderType(readerType);
 			return 0;
 		} catch (IllegalArgumentException e) {