updated meviz to work with new commandline parsing API

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

diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
index 051aaa8..9eb45de 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
@@ -11,43 +11,32 @@ package eu.svjatoslav.meviz.renamer;
 
 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.ExistingDirectory;
-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 recursiveParameter = new Parameter("Enable recursive mode.",
-                       "-r", "--recursive");
+       Parser parser = new Parser();
 
-       Parameter testParameter = new Parameter(
-                       "Simulate renaming (no changes will be actually done).", "-t",
-                       "--test");
+       NullParameter recursiveParameter = parser.createNullParameter(
+                       "Enable recursive mode.").addAliases("-r", "--recursive");
 
-       Parameter outputPatternParameter = new Parameter(true, true, true,
-                       new StringArgument(), "Output pattern.", "-o", "--output-pattern");
+       NullParameter testParameter = parser.createNullParameter(
+                       "Simulate renaming (no changes will be actually done).")
+                       .addAliases("-t", "--test");
 
-       Parameter inputPatternParameter = new Parameter(true, true, true,
-                       new StringArgument(), "File input pattern.", "-i",
-                       "--input-pattern");
+       StringParameter outputPatternParameter = parser.createStringParameter(
+                       "Output pattern.").addAliases("-o", "--output-pattern");
 
-       Parameter workingDirectoryParameter = new Parameter(false, true, true,
-                       new ExistingDirectory(), "Working directory.", "-w",
-                       "--working-directory");
+       StringParameter inputPatternParameter = parser.createStringParameter(
+                       "File input pattern.").addAliases("-i", "--input-pattern");
 
-       public Parser initParser() {
-
-               final Parser parser = new Parser();
-               parser.addParameter(recursiveParameter);
-               parser.addParameter(testParameter);
-               parser.addParameter(outputPatternParameter);
-               parser.addParameter(inputPatternParameter);
-               parser.addParameter(workingDirectoryParameter);
-
-               return parser;
-       }
+       DirectoryParameter workingDirectoryParameter = parser
+                       .createDirectoryParameter("Working directory.")
+                       .addAliases("-w", "--working-directory").mustExist();
 
        /**
         * @return {@link EncodingOptions} if commandline arguments were
@@ -58,7 +47,6 @@ public class CommandlineHandler {
 
                final RenamingOptions options = new RenamingOptions();
 
-               final Parser parser = initParser();
                if (!parser.parse(args))
                        return null;
 
@@ -69,15 +57,14 @@ public class CommandlineHandler {
                        options.recursive = true;
 
                if (outputPatternParameter.isParameterSpecified())
-                       options.outputPattern = outputPatternParameter
-                                       .getArgumentsAsStrings().get(0);
+                       options.outputPattern = outputPatternParameter.getValue();
 
                if (workingDirectoryParameter.isParameterSpecified())
-                       options.targetDirectory = workingDirectoryParameter
-                                       .getArgumentsAsFiles().get(0);
+                       options.targetDirectory = workingDirectoryParameter.getValue();
                else
                        options.targetDirectory = new File(System.getProperty("user.dir"));
 
+               // TODO: add multiple input patterns support
                if (inputPatternParameter.isParameterSpecified())
                        options.inputPatterns.addAll(inputPatternParameter
                                        .getArgumentsAsStrings());