From 39c3c6896743a3b6e375d51499036bb32f752114 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Mon, 27 Feb 2017 08:24:08 +0100 Subject: [PATCH] Add --version and also display it in UI --- Makefile.base | 1 + configure.sh | 2 +- ...es.jar => nikiroo-utils-1.3.3-sources.jar} | Bin 46800 -> 49423 bytes src/be/nikiroo/fanfix/Instance.java | 4 ++-- src/be/nikiroo/fanfix/Main.java | 13 ++++++++++++- .../fanfix/bundles/resources.properties | 1 + .../fanfix/reader/LocalReaderFrame.java | 3 ++- 7 files changed, 19 insertions(+), 5 deletions(-) rename libs/{nikiroo-utils-1.2.2-sources.jar => nikiroo-utils-1.3.3-sources.jar} (69%) diff --git a/Makefile.base b/Makefile.base index 99016440..54dbf1aa 100644 --- a/Makefile.base +++ b/Makefile.base @@ -94,6 +94,7 @@ resources: libs cp "$$ln" "../bin/$$ln" ; \ fi ; \ done + @cp VERSION bin/ test-resources: resources @echo Copying test resources into bin/... diff --git a/configure.sh b/configure.sh index ffdf4985..42eed0d0 100755 --- a/configure.sh +++ b/configure.sh @@ -48,7 +48,7 @@ echo "TEST = be/nikiroo/fanfix/test/Test" >> Makefile echo "TEST_PARAMS = $cols $ok $ko" >> Makefile echo "NAME = fanfix" >> Makefile echo "PREFIX = $PREFIX" >> Makefile -echo "JAR_FLAGS += -C bin/ org -C bin/ be -C ./ VERSION" >> Makefile +echo "JAR_FLAGS += -C bin/ org -C bin/ be -C bin/ VERSION" >> Makefile #echo "SJAR_FLAGS += -C src/ org -C src/ be -C ./ LICENSE -C ./ README.md -C ./ VERSION" >> Makefile cat Makefile.base >> Makefile diff --git a/libs/nikiroo-utils-1.2.2-sources.jar b/libs/nikiroo-utils-1.3.3-sources.jar similarity index 69% rename from libs/nikiroo-utils-1.2.2-sources.jar rename to libs/nikiroo-utils-1.3.3-sources.jar index 62e994f0d55053eaa7f4713b3963b5b4103c12cc..a7c9ff1ee16247db7dc91a0088ee1b5b11a15ca5 100644 GIT binary patch delta 13080 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 ([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 @@ -159,6 +161,8 @@ public class Main { case START: exitCode = 255; // not supposed to be selected by user break; + case VERSION: + exitCode = 255; // no arguments for this option } } @@ -212,6 +216,13 @@ 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())); + break; case START: UIUtils.setLookAndFeel(); BasicReader.setDefaultReaderType(ReaderType.LOCAL); diff --git a/src/be/nikiroo/fanfix/bundles/resources.properties b/src/be/nikiroo/fanfix/bundles/resources.properties index 9b01475e..a317eb1e 100644 --- a/src/be/nikiroo/fanfix/bundles/resources.properties +++ b/src/be/nikiroo/fanfix/bundles/resources.properties @@ -18,6 +18,7 @@ HELP_SYNTAX = Valid options:\n\ \t--list: list the stories present in the library\n\ \t--set-reader [reader type]: set the reader type to CLI or LOCAL for this command\n\ \t--help: this help message\n\ +\t--version: return the version of the program\n\ \n\ Supported input types:\n\ %s\n\ diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java index 0da34754..e15ee8d1 100644 --- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java +++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java @@ -38,6 +38,7 @@ import be.nikiroo.fanfix.data.Story; import be.nikiroo.fanfix.output.BasicOutput.OutputType; import be.nikiroo.fanfix.reader.LocalReaderBook.BookActionListener; import be.nikiroo.utils.Progress; +import be.nikiroo.utils.Version; import be.nikiroo.utils.ui.ProgressBar; import be.nikiroo.utils.ui.WrapLayout; @@ -71,7 +72,7 @@ class LocalReaderFrame extends JFrame { * the type of {@link Story} to load, or NULL for all types */ public LocalReaderFrame(LocalReader reader, String type) { - super("Fanfix Library"); + super(String.format("Fanfix %s Library", Version.getCurrentVersion())); this.reader = reader; -- 2.27.0