X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=85d74928458e1589926bd0e0ab0f8d34be725c78;hb=83f66cbbd12246a5e2f1aeee1afe36503b901814;hp=f51071d5c82faffd10e7bedd9d5b81c1b593f96f;hpb=b4dc6ab518ded2dd92e4cbb02ac615b1d57e8e6d;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index f51071d..85d7492 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -14,7 +14,9 @@ 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;
-import be.nikiroo.utils.UIUtils;
+import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
+import be.nikiroo.utils.ui.UIUtils;
/**
* Main program entry point.
@@ -23,7 +25,7 @@ import be.nikiroo.utils.UIUtils;
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START,
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION,
}
/**
@@ -34,8 +36,8 @@ public class Main {
* 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
+ * before taking the usual 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'
*
@@ -52,6 +54,7 @@ public class Main {
* --list ([type]): list the stories present in the library
* --set-reader [reader type]: set the reader type to CLI or LOCAL for
* this command
+ * --version: get the version of the program
*
*
* @param args
@@ -158,20 +161,66 @@ public class Main {
case START:
exitCode = 255; // not supposed to be selected by user
break;
+ case VERSION:
+ exitCode = 255; // no arguments for this option
+ }
+ }
+
+ final Progress mainProgress = new Progress(0, 80);
+ mainProgress.addProgressListener(new Progress.ProgressListener() {
+ private int current = mainProgress.getMin();
+
+ public void progress(Progress progress, String name) {
+ int diff = progress.getProgress() - current;
+ current += diff;
+
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < diff; i++) {
+ builder.append('.');
+ }
+
+ System.err.print(builder.toString());
+
+ if (progress.isDone()) {
+ System.err.println("");
+ }
+ }
+ });
+ Progress pg = new Progress();
+ mainProgress.addProgress(pg, mainProgress.getMax());
+
+ VersionCheck updates = VersionCheck.check();
+ if (updates.isNewVersionAvailable()) {
+ // Sent to syserr so not to cause problem if one tries to capture a
+ // story content in text mode
+ System.err
+ .println("A new version of the program is available at https://github.com/nikiroo/fanfix/releases");
+ System.err.println("");
+ for (Version v : updates.getNewer()) {
+ System.err.println("\tVersion " + v);
+ System.err.println("\t-------------");
+ System.err.println("");
+ for (String item : updates.getChanges().get(v)) {
+ System.err.println("\t- " + item);
+ }
+ System.err.println("");
}
}
if (exitCode != 255) {
switch (action) {
case IMPORT:
- exitCode = imprt(urlString);
+ exitCode = imprt(urlString, pg);
+ updates.ok(); // we consider it read
break;
case EXPORT:
- exitCode = export(luid, typeString, target);
+ exitCode = export(luid, typeString, target, pg);
+ updates.ok(); // we consider it read
break;
case CONVERT:
exitCode = convert(urlString, typeString, target,
- plusInfo == null ? false : plusInfo);
+ plusInfo == null ? false : plusInfo, pg);
+ updates.ok(); // we consider it read
break;
case LIST:
exitCode = list(typeString);
@@ -188,6 +237,14 @@ public class Main {
break;
case SET_READER:
break;
+ case VERSION:
+ System.out
+ .println(String.format("Fanfix version %s"
+ + "\nhttps://github.com/nikiroo/fanfix/"
+ + "\n\tWritten by Nikiroo",
+ Version.getCurrentVersion()));
+ updates.ok(); // we consider it read
+ break;
case START:
UIUtils.setLookAndFeel();
BasicReader.setDefaultReaderType(ReaderType.LOCAL);
@@ -205,45 +262,20 @@ public class Main {
}
}
- /**
- * Return an {@link URL} from this {@link String}, be it a file path or an
- * actual {@link URL}.
- *
- * @param sourceString
- * the source
- *
- * @return the corresponding {@link URL}
- *
- * @throws MalformedURLException
- * if this is neither a file nor a conventional {@link URL}
- */
- private static URL getUrl(String sourceString) throws MalformedURLException {
- if (sourceString == null || sourceString.isEmpty()) {
- throw new MalformedURLException("Empty url");
- }
-
- URL source = null;
- try {
- source = new URL(sourceString);
- } catch (MalformedURLException e) {
- File sourceFile = new File(sourceString);
- source = sourceFile.toURI().toURL();
- }
-
- return source;
- }
-
/**
* Import the given resource into the {@link Library}.
*
* @param urlString
* the resource to import
+ * @param pg
+ * the optional progress reporter
*
* @return the exit return code (0 = success)
*/
- public static int imprt(String urlString) {
+ public static int imprt(String urlString, Progress pg) {
try {
- Story story = Instance.getLibrary().imprt(getUrl(urlString));
+ Story story = Instance.getLibrary().imprt(
+ BasicReader.getUrl(urlString), pg);
System.out.println(story.getMeta().getLuid() + ": \""
+ story.getMeta().getTitle() + "\" imported.");
} catch (IOException e) {
@@ -263,10 +295,13 @@ public class Main {
* the {@link OutputType} to use
* @param target
* the target
+ * @param pg
+ * the optional progress reporter
*
* @return the exit return code (0 = success)
*/
- public static int export(String luid, String typeString, String target) {
+ public static int export(String luid, String typeString, String target,
+ Progress pg) {
OutputType type = OutputType.valueOfNullOkUC(typeString);
if (type == null) {
Instance.syserr(new Exception(trans(StringId.OUTPUT_DESC,
@@ -275,7 +310,7 @@ public class Main {
}
try {
- Instance.getLibrary().export(luid, type, target);
+ Instance.getLibrary().export(luid, type, target, pg);
} catch (IOException e) {
Instance.syserr(e);
return 4;
@@ -318,9 +353,9 @@ public class Main {
try {
BasicReader reader = BasicReader.getReader();
if (library) {
- reader.setStory(story);
+ reader.setStory(story, null);
} else {
- reader.setStory(getUrl(story));
+ reader.setStory(BasicReader.getUrl(story), null);
}
if (chapString != null) {
@@ -354,16 +389,18 @@ public class Main {
* @param infoCover
* TRUE to also export the cover and info file, even if the given
* {@link OutputType} does not usually save them
+ * @param pg
+ * the optional progress reporter
*
* @return the exit return code (0 = success)
*/
private static int convert(String urlString, String typeString,
- String target, boolean infoCover) {
+ String target, boolean infoCover, Progress pg) {
int exitCode = 0;
String sourceName = urlString;
try {
- URL source = getUrl(urlString);
+ URL source = BasicReader.getUrl(urlString);
sourceName = source.toString();
if (source.toString().startsWith("file://")) {
sourceName = sourceName.substring("file://".length());
@@ -380,12 +417,19 @@ public class Main {
BasicSupport support = BasicSupport.getSupport(source);
if (support != null) {
- Story story = support.process(source);
+ Progress pgIn = new Progress();
+ Progress pgOut = new Progress();
+ if (pg != null) {
+ pg.setMax(2);
+ pg.addProgress(pgIn, 1);
+ pg.addProgress(pgOut, 1);
+ }
+ Story story = support.process(source, pgIn);
try {
target = new File(target).getAbsolutePath();
BasicOutput.getOutput(type, infoCover).process(
- story, target);
+ story, target, pgOut);
} catch (IOException e) {
Instance.syserr(new IOException(trans(
StringId.ERR_SAVING, target), e));
@@ -445,7 +489,7 @@ public class Main {
for (OutputType type : OutputType.values()) {
builder.append(trans(StringId.ERR_SYNTAX_TYPE, type.toString(),
- type.getDesc()));
+ type.getDesc(true)));
builder.append('\n');
}