updated commandline handler

[meviz.git] / src / main / java / eu / svjatoslav / meviz / encoder / CommandlineHandler.java

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
index eb2ac08..870d476 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
@@ -9,62 +9,45 @@
 
 package eu.svjatoslav.meviz.encoder;
 
-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;
 
 public class CommandlineHandler {
 
-       Parameter outputFormatParameter = new Parameter(true, true, true,
-                       new StringArgument(), "Encoding output format.", "-o",
-                       "--output-format");
+       Parser parser = new Parser();
 
-       Parameter terminalParameter = new Parameter("Enable popup terminal.",
-                       "--terminal");
+       StringParameter outputFormatParameter = parser
+                       .createStringParameter("Encoding output format.")
+                       .addAliases("-o", "--output-format").setMandatory();
 
-       Parameter deinterlaceParameter = new Parameter("Deinterlace video.",
-                       "--deinterlace", "-d");
+       NullParameter terminalParameter = parser.createNullParameter(
+                       "Enable popup terminal.").addAliases("--terminal");
 
-       Parameter testParameter = new Parameter("Simulate file encoding.", "-t",
-                       "--test");
+       NullParameter deinterlaceParameter = parser.createNullParameter(
+                       "Deinterlace video.").addAliases("--deinterlace", "-d");
 
-       Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-                       "-r", "--recursive");
+       NullParameter testParameter = parser.createNullParameter(
+                       "Simulate file encoding.").addAliases("-t", "--test");
 
-       Parameter inputPatternParameter = new Parameter(true, true, true,
-                       new StringArgument(), "File input pattern.", "-i",
-                       "--input-pattern");
+       NullParameter recursiveParameter = parser.createNullParameter(
+                       "Enable recursive mode.").addAliases("-r", "--recursive");
 
-       Parameter workingDirectoryParameter = new Parameter(
-                       false,
-                       true,
-                       true,
-                       new eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory(),
-                       "Working directory.", "-w", "--working-directory");
+       StringParameter inputPatternParameter = parser
+                       .createStringParameter("File input pattern.")
+                       .addAliases("-i", "--input-pattern").setMandatory();
 
-       Parameter videoBitrateParameter = new Parameter(false, true, false,
-                       new Bitrate(), "Video bitrate.", "-v", "--video-bitrate");
+       DirectoryParameter workingDirectoryParameter = parser
+                       .createDirectoryParameter("Working directory.")
+                       .addAliases("-w", "--working-directory").mustExist();
 
-       public Parser initParser() {
-               final Parser parser = new Parser();
-
-               parser.addParameter(recursiveParameter);
-
-               parser.addParameter(deinterlaceParameter);
-
-               parser.addParameter(testParameter);
-
-               parser.addParameter(terminalParameter);
-
-               parser.addParameter(outputFormatParameter);
-
-               parser.addParameter(inputPatternParameter);
-
-               parser.addParameter(workingDirectoryParameter);
+       BitrateParameter videoBitrateParameter = new BitrateParameter(
+                       "Video bitrate");
 
+       public CommandlineHandler() {
+               videoBitrateParameter.addAliases("-v", "--video-bitrate");
                parser.addParameter(videoBitrateParameter);
-
-               return parser;
        }
 
        /**
@@ -76,7 +59,6 @@ public class CommandlineHandler {
 
                final EncodingOptions options = new EncodingOptions();
 
-               final Parser parser = initParser();
                parser.parse(args);
 
                if (recursiveParameter.isParameterSpecified())
@@ -105,9 +87,7 @@ public class CommandlineHandler {
 
                if (videoBitrateParameter.isParameterSpecified())
                        try {
-                               options.videoBitrate = Bitrate.bitrate
-                                               .valueOf(videoBitrateParameter.getArgumentAsString()
-                                                               .toUpperCase());
+                               options.videoBitrate = videoBitrateParameter.getValue();
                        } catch (final Exception e) {
                                System.out
                                                .println("Invalid video bitrate. Valid values are: LOW, MEDIUM, HIGH.");