X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=1c1bc545d59a88e7aeda74dbe79dfa871437581a;hb=333f0e7b5e333e8f6222881ce35398f403fc4121;hp=406e8a2fb4b9fb0ae1ebfa1a3adbc9203f419888;hpb=948637bc8cc1dcf76f783870cf46f71794a9805d;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 406e8a2..1c1bc54 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -22,7 +22,7 @@ import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START,
}
/**
@@ -46,9 +46,9 @@ public class Main {
* target
*
--read [id] ([chapter number]): read the given story from the library
*
- * --read-url [URL] ([cahpter number]): convert on the fly and read the
+ * --read-url [URL] ([chapter number]): convert on the fly and read the
* story, without saving it
- * --list: list the stories present in the library
+ * --list ([type]): list the stories present in the library
* --set-reader [reader type]: set the reader type to CLI or LOCAL for
* this command
*
@@ -62,7 +62,7 @@ public class Main {
String typeString = null;
String chapString = null;
String target = null;
- MainAction action = MainAction.HELP;
+ MainAction action = MainAction.START;
Boolean plusInfo = null;
boolean noMoreActions = false;
@@ -154,6 +154,9 @@ public class Main {
case SET_READER:
exitCode = setReaderType(args[i]);
break;
+ case START:
+ exitCode = 255; // not supposed to be selected by user
+ break;
}
}
@@ -163,7 +166,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,
@@ -184,6 +187,10 @@ public class Main {
break;
case SET_READER:
break;
+ case START:
+ BasicReader.setDefaultReaderType(ReaderType.LOCAL);
+ BasicReader.getReader().start(null);
+ break;
}
}
@@ -232,7 +239,7 @@ public class Main {
*
* @return the exit return code (0 = success)
*/
- private static int imprt(String urlString) {
+ public static int imprt(String urlString) {
try {
Story story = Instance.getLibrary().imprt(getUrl(urlString));
System.out.println(story.getMeta().getLuid() + ": \""
@@ -248,7 +255,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
@@ -257,7 +264,7 @@ public class Main {
*
* @return the exit return code (0 = success)
*/
- private static int export(String urlString, String typeString, String target) {
+ public 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,
@@ -266,9 +273,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;
@@ -282,23 +287,13 @@ public class Main {
* is passed, in which case all stories will be listed).
*
* @param typeString
- * the {@link SupportType} to list the known stories of, or NULL
- * to list all stories
+ * the type to list the known stories of, or NULL to list all
+ * stories
*
* @return the exit return code (0 = success)
*/
- private static int list(String typeString) {
- SupportType type = null;
- try {
- type = SupportType.valueOfNullOkUC(typeString);
- } catch (Exception e) {
- Instance.syserr(new Exception(
- trans(StringId.INPUT_DESC, typeString), e));
- return 1;
- }
-
+ private static int list(String type) {
BasicReader.getReader().start(type);
-
return 0;
}
@@ -381,6 +376,7 @@ public class Main {
} else {
try {
BasicSupport support = BasicSupport.getSupport(source);
+
if (support != null) {
Story story = support.process(source);