Updated copyright message.

[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..bc8c858 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
- * 
+ * Copyright (C) 2012 -- 2018, 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.
@@ -9,79 +9,70 @@
 
 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.commons.commandline.parameterparser.parameter.StringParameters;
 import eu.svjatoslav.meviz.encoder.EncodingOptions;
 
-public class CommandlineHandler {
-
-       Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-                       "-r", "--recursive");
+import java.io.File;
 
-       Parameter testParameter = new Parameter(
-                       "Simulate renaming (no changes will be actually done).", "-t",
-                       "--test");
+class CommandlineHandler {
 
-       Parameter outputPatternParameter = new Parameter(true, true, true,
-                       new StringArgument(), "Output pattern.", "-o", "--output-pattern");
+    final Parser parser = new Parser();
 
-       Parameter inputPatternParameter = new Parameter(true, true, true,
-                       new StringArgument(), "File input pattern.", "-i",
-                       "--input-pattern");
+    private final NullParameter recursiveParameter = parser.add(
+            new NullParameter("Enable recursive mode.")).addAliases("-r",
+            "--recursive");
 
-       Parameter workingDirectoryParameter = new Parameter(false, true, true,
-                       new ExistingDirectory(), "Working directory.", "-w",
-                       "--working-directory");
+    private final NullParameter testParameter = parser.add(
+            new NullParameter(
+                    "Simulate renaming (no changes will be actually done)."))
+            .addAliases("-t", "--test");
 
-       public Parser initParser() {
+    private final StringParameter outputPatternParameter = parser.add(
+            new StringParameter("Output pattern.")).addAliases("-o",
+            "--output-pattern");
 
-               final Parser parser = new Parser();
-               parser.addParameter(recursiveParameter);
-               parser.addParameter(testParameter);
-               parser.addParameter(outputPatternParameter);
-               parser.addParameter(inputPatternParameter);
-               parser.addParameter(workingDirectoryParameter);
+    private final StringParameters inputPatternParameter = parser.add(
+            new StringParameters("File input pattern.")).addAliases("-i",
+            "--input-pattern");
 
-               return parser;
-       }
+    private final DirectoryParameter workingDirectoryParameter = parser
+            .add(new DirectoryParameter("Working directory."))
+            .addAliases("-w", "--working-directory").mustExist();
 
-       /**
-        * @return {@link EncodingOptions} if commandline arguments were
-        *         successfully parsed, or <code>null</code> if parsing error
-        *         occurred.
-        */
-       public RenamingOptions parseCommandlineArguments(final String[] args) {
+    /**
+     * @return {@link EncodingOptions} if commandline arguments were
+     * successfully parsed, or <code>null</code> if parsing error
+     * occurred.
+     */
+    public RenamingOptions parseCommandlineArguments(final String[] args) {
 
-               final RenamingOptions options = new RenamingOptions();
+        final RenamingOptions options = new RenamingOptions();
 
-               final Parser parser = initParser();
-               if (!parser.parse(args))
-                       return null;
+        if (!parser.parse(args))
+            return null;
 
-               if (testParameter.isParameterSpecified())
-                       options.testOnly = true;
+        if (testParameter.isSpecified())
+            options.testOnly = true;
 
-               if (recursiveParameter.isParameterSpecified())
-                       options.recursive = true;
+        if (recursiveParameter.isSpecified())
+            options.recursive = true;
 
-               if (outputPatternParameter.isParameterSpecified())
-                       options.outputPattern = outputPatternParameter
-                                       .getArgumentsAsStrings().get(0);
+        if (outputPatternParameter.isSpecified())
+            options.outputPattern = outputPatternParameter.getValue();
 
-               if (workingDirectoryParameter.isParameterSpecified())
-                       options.targetDirectory = workingDirectoryParameter
-                                       .getArgumentsAsFiles().get(0);
-               else
-                       options.targetDirectory = new File(System.getProperty("user.dir"));
+        if (workingDirectoryParameter.isSpecified())
+            options.targetDirectory = workingDirectoryParameter.getValue();
+        else
+            options.targetDirectory = new File(System.getProperty("user.dir"));
 
-               if (inputPatternParameter.isParameterSpecified())
-                       options.inputPatterns.addAll(inputPatternParameter
-                                       .getArgumentsAsStrings());
+        // TODO: add multiple input patterns support
+        if (inputPatternParameter.isSpecified())
+            options.inputPatterns.addAll(inputPatternParameter.getValue());
 
-               return options;
-       }
+        return options;
+    }
 }