X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=46eb0b5ab9fc08becb2b55924aa9ef2bb6b9f092;hb=a6395bef99a8e917f67341ef1906917b87df24a4;hp=3ecc612eb2f111f14cd39a5c7e853ed447fcd32c;hpb=89cb07a69f3ee217f9ea6a4284bec0df94ef77fa;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 3ecc612..46eb0b5 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -10,8 +10,8 @@ import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.output.BasicOutput;
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
-import be.nikiroo.fanfix.reader.FanfixReader;
-import be.nikiroo.fanfix.reader.cli.CliReader;
+import be.nikiroo.fanfix.reader.BasicReader;
+import be.nikiroo.fanfix.reader.BasicReader.ReaderType;
import be.nikiroo.fanfix.supported.BasicSupport;
import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
@@ -21,68 +21,174 @@ import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
* @author niki
*/
public class Main {
+ private enum MainAction {
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER
+ }
+
/**
* Main program entry point.
*
* Known environment variables:
*
- * - NOUTF: if set to 1, the program will prefer non-unicode
+ *
- NOUTF: if set to 1 or 'true', the program will prefer non-unicode
* {@link String}s when possible
* - CONFIG_DIR: a path where to look for the .properties files
* before taking the included ones; they will also be saved/updated into
* this path when the program starts
+ * - DEBUG: if set to 1 or 'true', the program will override the DEBUG_ERR
+ * configuration value with 'true'
+ *
+ *
+ *
+ * - --import [URL]: import into library
+ * - --export [id] [output_type] [target]: export story to target
+ * - --convert [URL] [output_type] [target] (+info): convert URL into
+ * target
+ * - --read [id] ([chapter number]): read the given story from the library
+ *
+ * - --read-url [URL] ([cahpter number]): convert on the fly and read the
+ * story, without saving it
+ * - --list: list the stories present in the library
+ * - --set-reader [reader type]: set the reader type to CLI or LOCAL for
+ * this command
*
*
* @param args
- *
- * - --import [URL]: import into library
- --export [id]
- * [output_type] [target]: export story to target
-
- * --convert [URL] [output_type] [target]: convert URL into
- * target
- --read [id]: read the given story from the
- * library
- --read-url [URL]: convert on the fly and read
- * the story, without saving it
- --list: list the stories
- * present in the library
- *
+ * see method description
*/
public static void main(String[] args) {
- int exitCode = 255;
+ String urlString = null;
+ String luid = null;
+ String typeString = null;
+ String chapString = null;
+ String target = null;
+ MainAction action = MainAction.HELP;
+ Boolean plusInfo = null;
- if (args.length > 0) {
- String action = args[0];
- if (action.equals("--import")) {
- if (args.length > 1) {
- exitCode = imprt(args[1]);
+ boolean noMoreActions = false;
+
+ int exitCode = 0;
+ for (int i = 0; exitCode == 0 && i < args.length; i++) {
+ // Action (--) handling:
+ if (!noMoreActions && args[i].startsWith("--")) {
+ if (args[i].equals("--")) {
+ noMoreActions = true;
+ } else {
+ try {
+ action = MainAction.valueOf(args[i].substring(2)
+ .toUpperCase().replace("-", "_"));
+ } catch (Exception e) {
+ Instance.syserr(new IllegalArgumentException(
+ "Unknown action: " + args[i], e));
+ exitCode = 255;
+ }
}
- } else if (action.equals("--export")) {
- if (args.length > 3) {
- exitCode = export(args[1], args[2], args[3]);
+
+ continue;
+ }
+
+ switch (action) {
+ case IMPORT:
+ if (urlString == null) {
+ urlString = args[i];
+ } else {
+ exitCode = 255;
+ }
+ break;
+ case EXPORT:
+ if (luid == null) {
+ luid = args[i];
+ } else if (typeString == null) {
+ typeString = args[i];
+ } else if (target == null) {
+ target = args[i];
+ } else {
+ exitCode = 255;
+ }
+ break;
+ case CONVERT:
+ if (urlString == null) {
+ urlString = args[i];
+ } else if (typeString == null) {
+ typeString = args[i];
+ } else if (target == null) {
+ target = args[i];
+ } else if (plusInfo == null) {
+ if ("+info".equals(args[i])) {
+ plusInfo = true;
+ } else {
+ exitCode = 255;
+ }
+ } else {
+ exitCode = 255;
}
- } else if (action.equals("--convert")) {
- if (args.length > 3) {
- exitCode = convert(
- args[1],
- args[2],
- args[3],
- args.length > 4 ? args[4].toLowerCase().equals(
- "+info") : false);
+ break;
+ case LIST:
+ if (typeString == null) {
+ typeString = args[i];
+ } else {
+ exitCode = 255;
}
- } else if (action.equals("--list")) {
- exitCode = list(args.length > 1 ? args[1] : null);
- } else if (action.equals("--read-url")) {
- if (args.length > 1) {
- exitCode = read(args[1], args.length > 2 ? args[2] : null,
- false);
+ break;
+ case READ:
+ if (luid == null) {
+ luid = args[i];
+ } else if (chapString == null) {
+ chapString = args[i];
+ } else {
+ exitCode = 255;
}
- } else if (action.equals("--read")) {
- if (args.length > 1) {
- exitCode = read(args[1], args.length > 2 ? args[2] : null,
- true);
+ break;
+ case READ_URL:
+ if (urlString == null) {
+ urlString = args[i];
+ } else if (chapString == null) {
+ chapString = args[i];
+ } else {
+ exitCode = 255;
}
+ break;
+ case HELP:
+ exitCode = 255;
+ break;
+ case SET_READER:
+ exitCode = setReaderType(args[i]);
+ break;
+ }
+ }
+
+ if (exitCode != 255) {
+ switch (action) {
+ case IMPORT:
+ exitCode = imprt(urlString);
+ break;
+ case EXPORT:
+ exitCode = export(luid, typeString, target);
+ break;
+ case CONVERT:
+ exitCode = convert(urlString, typeString, target,
+ plusInfo == null ? false : plusInfo);
+ break;
+ case LIST:
+ exitCode = list(typeString);
+ break;
+ case READ:
+ exitCode = read(luid, chapString, true);
+ break;
+ case READ_URL:
+ exitCode = read(urlString, chapString, false);
+ break;
+ case HELP:
+ syntax(true);
+ exitCode = 0;
+ break;
+ case SET_READER:
+ break;
}
}
if (exitCode == 255) {
- syntax();
+ syntax(false);
}
if (exitCode != 0) {
@@ -121,14 +227,14 @@ public class Main {
/**
* Import the given resource into the {@link Library}.
*
- * @param sourceString
+ * @param urlString
* the resource to import
*
* @return the exit return code (0 = success)
*/
- private static int imprt(String sourceString) {
+ private static int imprt(String urlString) {
try {
- Story story = Instance.getLibrary().imprt(getUrl(sourceString));
+ Story story = Instance.getLibrary().imprt(getUrl(urlString));
System.out.println(story.getMeta().getLuid() + ": \""
+ story.getMeta().getTitle() + "\" imported.");
} catch (IOException e) {
@@ -142,7 +248,7 @@ public class Main {
/**
* Export the {@link Story} from the {@link Library} to the given target.
*
- * @param sourceString
+ * @param luid
* the story LUID
* @param typeString
* the {@link OutputType} to use
@@ -151,8 +257,7 @@ public class Main {
*
* @return the exit return code (0 = success)
*/
- private static int export(String sourceString, 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,
@@ -161,9 +266,7 @@ public class Main {
}
try {
- Story story = Instance.getLibrary().imprt(new URL(sourceString));
- Instance.getLibrary().export(story.getMeta().getLuid(), type,
- target);
+ Instance.getLibrary().export(luid, type, target);
} catch (IOException e) {
Instance.syserr(e);
return 4;
@@ -192,7 +295,7 @@ public class Main {
return 1;
}
- new CliReader().start(type);
+ BasicReader.getReader().start(type);
return 0;
}
@@ -203,7 +306,7 @@ public class Main {
* @param story
* the LUID of the {@link Story} in the {@link Library} or
* the {@link Story} {@link URL}
- * @param chap
+ * @param chapString
* which {@link Chapter} to read (starting at 1), or NULL to get
* the {@link Story} description
* @param library
@@ -212,17 +315,23 @@ public class Main {
*
* @return the exit return code (0 = success)
*/
- private static int read(String story, String chap, boolean library) {
+ private static int read(String story, String chapString, boolean library) {
try {
- FanfixReader reader = new CliReader();
+ BasicReader reader = BasicReader.getReader();
if (library) {
reader.setStory(story);
} else {
reader.setStory(getUrl(story));
}
- if (chap != null) {
- reader.read(Integer.parseInt(chap));
+ if (chapString != null) {
+ try {
+ reader.read(Integer.parseInt(chapString));
+ } catch (NumberFormatException e) {
+ Instance.syserr(new IOException(
+ "Chapter number cannot be parsed: " + chapString, e));
+ return 2;
+ }
} else {
reader.read();
}
@@ -237,11 +346,11 @@ public class Main {
/**
* Convert the {@link Story} into another format.
*
- * @param sourceString
+ * @param urlString
* the source {@link Story} to convert
* @param typeString
* the {@link OutputType} to convert to
- * @param filename
+ * @param target
* the target file
* @param infoCover
* TRUE to also export the cover and info file, even if the given
@@ -249,13 +358,13 @@ public class Main {
*
* @return the exit return code (0 = success)
*/
- private static int convert(String sourceString, String typeString,
- String filename, boolean infoCover) {
+ private static int convert(String urlString, String typeString,
+ String target, boolean infoCover) {
int exitCode = 0;
- String sourceName = sourceString;
+ String sourceName = urlString;
try {
- URL source = getUrl(sourceString);
+ URL source = getUrl(urlString);
sourceName = source.toString();
if (source.toString().startsWith("file://")) {
sourceName = sourceName.substring("file://".length());
@@ -270,16 +379,17 @@ public class Main {
} else {
try {
BasicSupport support = BasicSupport.getSupport(source);
+
if (support != null) {
Story story = support.process(source);
try {
- filename = new File(filename).getAbsolutePath();
+ target = new File(target).getAbsolutePath();
BasicOutput.getOutput(type, infoCover).process(
- story, filename);
+ story, target);
} catch (IOException e) {
Instance.syserr(new IOException(trans(
- StringId.ERR_SAVING, filename), e));
+ StringId.ERR_SAVING, target), e));
exitCode = 5;
}
} else {
@@ -316,27 +426,55 @@ public class Main {
}
/**
- * Display the correct syntax of the program to the user.
+ * Display the correct syntax of the program to the user to stdout, or an
+ * error message if the syntax used was wrong on stderr.
+ *
+ * @param showHelp
+ * TRUE to show the syntax help, FALSE to show "syntax error"
*/
- private static void syntax() {
- StringBuilder builder = new StringBuilder();
- for (SupportType type : SupportType.values()) {
- builder.append(trans(StringId.ERR_SYNTAX_TYPE, type.toString(),
- type.getDesc()));
- builder.append('\n');
- }
+ private static void syntax(boolean showHelp) {
+ if (showHelp) {
+ StringBuilder builder = new StringBuilder();
+ for (SupportType type : SupportType.values()) {
+ builder.append(trans(StringId.ERR_SYNTAX_TYPE, type.toString(),
+ type.getDesc()));
+ builder.append('\n');
+ }
- String typesIn = builder.toString();
- builder.setLength(0);
+ String typesIn = builder.toString();
+ builder.setLength(0);
- for (OutputType type : OutputType.values()) {
- builder.append(trans(StringId.ERR_SYNTAX_TYPE, type.toString(),
- type.getDesc()));
- builder.append('\n');
- }
+ for (OutputType type : OutputType.values()) {
+ builder.append(trans(StringId.ERR_SYNTAX_TYPE, type.toString(),
+ type.getDesc()));
+ builder.append('\n');
+ }
- String typesOut = builder.toString();
+ String typesOut = builder.toString();
- System.err.println(trans(StringId.ERR_SYNTAX, typesIn, typesOut));
+ System.out.println(trans(StringId.HELP_SYNTAX, typesIn, typesOut));
+ } else {
+ System.err.println(trans(StringId.ERR_SYNTAX));
+ }
+ }
+
+ /**
+ * Set the default reader type for this session only (it can be changed in
+ * the configuration file, too, but this value will override it).
+ *
+ * @param readerTypeString
+ * the type
+ */
+ private static int setReaderType(String readerTypeString) {
+ try {
+ ReaderType readerType = ReaderType.valueOf(readerTypeString
+ .toUpperCase());
+ BasicReader.setDefaultReaderType(readerType);
+ return 0;
+ } catch (IllegalArgumentException e) {
+ Instance.syserr(new IOException("Unknown reader type: "
+ + readerTypeString, e));
+ return 1;
+ }
}
}