X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FCommandlineHandler.java;h=93a9d7b03ba52c6a80037946c3372b05fbcc488a;hb=631a59ffccb6548ce1a2471982495e4094a7dd4b;hp=84bff070ea47aac003dd692daaa2de711450a1a6;hpb=6b6927aafa42fefece54df3c05ebd9161993ef52;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 84bff07..93a9d7b 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
@@ -1,64 +1,60 @@
/*
* Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
+ * Copyright (C) 2012 -- 2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
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.arguments.StringArgument;
+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 StringArgument(), "Gallery title. (default is: "
- + Constants.DEFAULT_GALLERY_TITLE + ").", "-t",
- "--gallery-title");
-
- Parameter workingDirectoryParameter = new Parameter(false, true, true,
- new StringArgument(), "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);
+import java.io.File;
- if (workingDirectoryParameter.isParameterSpecified())
- options.workingDirectory = workingDirectoryParameter
- .getArgumentsAsFiles().get(0);
- else
- options.workingDirectory = new File(System.getProperty("user.dir"));
+public class CommandlineHandler {
- return options;
- }
+ final Parser parser = new Parser();
+ final NullParameter removeIndex = parser.add(
+ new NullParameter("Remove generated index")).addAliases("-r",
+ "--remove");
+ private final StringParameter galleryNameParameter = parser.add(
+ new StringParameter("Gallery title. (default is: "
+ + Constants.DEFAULT_GALLERY_TITLE + ").")).addAliases("-t",
+ "--gallery-title");
+ private final DirectoryParameter workingDirectoryParameter = parser
+ .add(new DirectoryParameter("Working directory."))
+ .addAliases("-w", "--working-directory").mustExist();
+
+ public String getGalleryTitle() {
+ if (galleryNameParameter.isSpecified())
+ return galleryNameParameter.getValue();
+ return Constants.DEFAULT_GALLERY_TITLE;
+ }
+
+ public File getWorkingDirectory() {
+ if (workingDirectoryParameter.isSpecified())
+ 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;
+ }
}