support for copy codec for avconv

[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 1c559c7..e5ebda3 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, 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.
@@ -11,51 +11,33 @@ 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.parameter.DirectoryParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameters;
 import eu.svjatoslav.meviz.encoder.EncodingOptions;
 
 public class CommandlineHandler {
 
-       Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-                       "-r", "--recursive");
-
-       Parameter testParameter = new Parameter(
-                       "Simulate renaming (no changes will be actually done).", "-t",
-                       "--test");
-
-       Parameter outputPatternParameter = new Parameter(
-                       true,
-                       true,
-                       true,
-                       new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(),
-                       "Output pattern.", "-o", "--output-pattern");
-
-       Parameter inputPatternParameter = new Parameter(
-                       true,
-                       true,
-                       true,
-                       new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(),
-                       "File input pattern.", "-i", "--input-pattern");
-
-       Parameter workingDirectoryParameter = new Parameter(
-                       false,
-                       true,
-                       true,
-                       new eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory(),
-                       "Working directory.", "-w", "--working-directory");
-
-       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;
-       }
+       Parser parser = new Parser();
+
+       NullParameter recursiveParameter = parser.createNullParameter(
+                       "Enable recursive mode.").addAliases("-r", "--recursive");
+
+       NullParameter testParameter = parser.createNullParameter(
+                       "Simulate renaming (no changes will be actually done).")
+                       .addAliases("-t", "--test");
+
+       StringParameter outputPatternParameter = parser.createStringParameter(
+                       "Output pattern.").addAliases("-o", "--output-pattern");
+
+       StringParameters inputPatternParameter = parser.createStringParameters(
+                       "File input pattern.").addAliases("-i", "--input-pattern");
+
+       DirectoryParameter workingDirectoryParameter = parser
+                       .createDirectoryParameter("Working directory.")
+                       .addAliases("-w", "--working-directory").mustExist();
 
        /**
         * @return {@link EncodingOptions} if commandline arguments were
@@ -66,7 +48,6 @@ public class CommandlineHandler {
 
                final RenamingOptions options = new RenamingOptions();
 
-               final Parser parser = initParser();
                if (!parser.parse(args))
                        return null;
 
@@ -77,18 +58,16 @@ 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());
+                       options.inputPatterns.addAll(inputPatternParameter.getValue());
 
                return options;
        }