X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=5cd3313897317d7fb5a03c73c17557ff421ae890;hb=edfd3577ad35ca77bc0312849c6f4ccfe3394a5f;hp=b989c68a1a3b648f4f96c47398b602ebd6e2814d;hpb=edd4628984f5f06e955606651fc828ac839f7f43;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index b989c68..5cd3313 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -15,6 +15,7 @@ import be.nikiroo.fanfix.reader.BasicReader.ReaderType;
import be.nikiroo.fanfix.supported.BasicSupport;
import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
import be.nikiroo.utils.ui.UIUtils;
/**
@@ -24,7 +25,7 @@ import be.nikiroo.utils.ui.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,
}
/**
@@ -51,8 +52,9 @@ public class Main {
*
--read-url [URL] ([chapter number]): convert on the fly and read the
* story, without saving it
* --list ([type]): list the stories present in the library
- * --set-reader [reader type]: set the reader type to CLI or LOCAL for
- * this command
+ * --set-reader [reader type]: set the reader type to CLI, TUI or LOCAL
+ * for this command
+ * --version: get the version of the program
*
*
* @param args
@@ -155,10 +157,13 @@ public class Main {
break;
case SET_READER:
exitCode = setReaderType(args[i]);
+ action = MainAction.START;
break;
case START:
exitCode = 255; // not supposed to be selected by user
break;
+ case VERSION:
+ exitCode = 255; // no arguments for this option
}
}
@@ -185,17 +190,38 @@ public class Main {
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, pg);
+ updates.ok(); // we consider it read
break;
case EXPORT:
exitCode = export(luid, typeString, target, pg);
+ updates.ok(); // we consider it read
break;
case CONVERT:
exitCode = convert(urlString, typeString, target,
plusInfo == null ? false : plusInfo, pg);
+ updates.ok(); // we consider it read
break;
case LIST:
exitCode = list(typeString);
@@ -212,9 +238,16 @@ 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);
+ //BasicReader.setDefaultReaderType(ReaderType.LOCAL);
BasicReader.getReader().start(null);
break;
}
@@ -290,7 +323,7 @@ public class Main {
* List the stories of the given type from the {@link Library} (unless NULL
* is passed, in which case all stories will be listed).
*
- * @param typeString
+ * @param type
* the type to list the known stories of, or NULL to list all
* stories
*