X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=meviz.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Frenamer%2FCommandlineHandler.java;h=bc8c8582acf5168dadc7babe0d350c910c2a0fd7;hp=1c559c727c98123f5ff70bd3b5465d8ddb02b7f1;hb=cf6e4ace4972f24f40f88ea12fcf99c763e4e40a;hpb=50cb7085d553fdd82cd06806cd27b1675299f719

diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
index 1c559c7..bc8c858 100755
--- 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,87 +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.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;
-	}
-
-	/**
-	 * @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 Parser parser = initParser();
-		if (!parser.parse(args))
-			return null;
-
-		if (testParameter.isParameterSpecified())
-			options.testOnly = true;
-
-		if (recursiveParameter.isParameterSpecified())
-			options.recursive = true;
-
-		if (outputPatternParameter.isParameterSpecified())
-			options.outputPattern = outputPatternParameter
-					.getArgumentsAsStrings().get(0);
-
-		if (workingDirectoryParameter.isParameterSpecified())
-			options.targetDirectory = workingDirectoryParameter
-					.getArgumentsAsFiles().get(0);
-		else
-			options.targetDirectory = new File(System.getProperty("user.dir"));
-
-		if (inputPatternParameter.isParameterSpecified())
-			options.inputPatterns.addAll(inputPatternParameter
-					.getArgumentsAsStrings());
-
-		return options;
-	}
+import java.io.File;
+
+class CommandlineHandler {
+
+    final Parser parser = new Parser();
+
+    private final NullParameter recursiveParameter = parser.add(
+            new NullParameter("Enable recursive mode.")).addAliases("-r",
+            "--recursive");
+
+    private final NullParameter testParameter = parser.add(
+            new NullParameter(
+                    "Simulate renaming (no changes will be actually done)."))
+            .addAliases("-t", "--test");
+
+    private final StringParameter outputPatternParameter = parser.add(
+            new StringParameter("Output pattern.")).addAliases("-o",
+            "--output-pattern");
+
+    private final StringParameters inputPatternParameter = parser.add(
+            new StringParameters("File input pattern.")).addAliases("-i",
+            "--input-pattern");
+
+    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) {
+
+        final RenamingOptions options = new RenamingOptions();
+
+        if (!parser.parse(args))
+            return null;
+
+        if (testParameter.isSpecified())
+            options.testOnly = true;
+
+        if (recursiveParameter.isSpecified())
+            options.recursive = true;
+
+        if (outputPatternParameter.isSpecified())
+            options.outputPattern = outputPatternParameter.getValue();
+
+        if (workingDirectoryParameter.isSpecified())
+            options.targetDirectory = workingDirectoryParameter.getValue();
+        else
+            options.targetDirectory = new File(System.getProperty("user.dir"));
+
+        // TODO: add multiple input patterns support
+        if (inputPatternParameter.isSpecified())
+            options.inputPatterns.addAll(inputPatternParameter.getValue());
+
+        return options;
+    }
 }