X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FCommandlineHandler.java;h=95aacf053c485db0ab7a77c244bfdbec8e42869c;hb=3150dfd568eefef9919ed202fd0cbfc0ab739d97;hp=6095673d6b6c94078c8117ba5f4986ca72af112b;hpb=50cb7085d553fdd82cd06806cd27b1675299f719;p=meviz.git
diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
index 6095673..95aacf0 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
@@ -11,53 +11,51 @@ package eu.svjatoslav.meviz.htmlindexer;
import java.io.File;
-import eu.svjatoslav.commons.commandline.parameterparser.Parameter;
import eu.svjatoslav.commons.commandline.parameterparser.Parser;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameter;
import eu.svjatoslav.meviz.encoder.EncodingOptions;
public class CommandlineHandler {
- Parameter galleryNameParameter = new Parameter(false, true, false,
- new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(), "Gallery title. (default is: "
- + Constants.DEFAULT_GALLERY_TITLE + ").", "-t", "--gallery-title");
-
- Parameter workingDirectoryParameter = new Parameter(false, true, true,
- new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(), "Working directory.", "-w",
- "--working-directory");
-
- public Parser initParser() {
-
- final Parser parser = new Parser();
- parser.addParameter(galleryNameParameter);
- parser.addParameter(workingDirectoryParameter);
-
- return parser;
- }
-
- /**
- * @return {@link EncodingOptions} if commandline arguments were
- * successfully parsed, or null
if parsing error
- * occurred.
- */
- public IndexingOptions parseCommandlineArguments(final String[] args) {
-
- final IndexingOptions options = new IndexingOptions();
-
- final Parser parser = initParser();
- if (!parser.parse(args)) {
- return null;
- }
-
- if (galleryNameParameter.isParameterSpecified()) {
- options.galleryTitle = galleryNameParameter.getArgumentsAsStrings().get(0);
- }
-
- if (workingDirectoryParameter.isParameterSpecified()) {
- options.workingDirectory = workingDirectoryParameter.getArgumentsAsFiles().get(0);
- } else {
- options.workingDirectory = new File(System.getProperty("user.dir"));
- }
-
- return options;
- }
+ Parser parser = new Parser();
+
+ StringParameter galleryNameParameter = parser.createStringParameter(
+ "Gallery title. (default is: " + Constants.DEFAULT_GALLERY_TITLE
+ + ").").addAliases("-t", "--gallery-title");
+
+ DirectoryParameter workingDirectoryParameter = parser
+ .createDirectoryParameter("Working directory.")
+ .addAliases("-w", "--working-directory").mustExist();
+
+ NullParameter removeIndex = parser.createNullParameter(
+ "Remove generated index").addAliases("-r", "--remove");
+
+ public String getGalleryTitle() {
+ if (galleryNameParameter.isParameterSpecified())
+ return galleryNameParameter.getValue();
+ return Constants.DEFAULT_GALLERY_TITLE;
+ }
+
+ public File getWorkingDirectory() {
+ if (workingDirectoryParameter.isParameterSpecified())
+ return workingDirectoryParameter.getValue();
+ else
+ return new File(System.getProperty("user.dir"));
+ }
+
+ /**
+ * @return {@link EncodingOptions} if commandline arguments were
+ * successfully parsed, or null
if parsing error
+ * occurred.
+ */
+ public boolean parseCommandlineArguments(final String[] args) {
+ final boolean parsingSucceeded = parser.parse(args);
+
+ if (!parsingSucceeded)
+ parser.showHelp();
+
+ return parsingSucceeded;
+ }
}