X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Frenamer%2FCommandlineHandler.java;h=817d5e5cb842ebc081664d336a7d644f11fe9930;hb=0679806fed21137dc0d10f1ef99dc1bba73ddb95;hp=051aaa82668763c646f1d8b8b499630a3baece62;hpb=6b6927aafa42fefece54df3c05ebd9161993ef52;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
index 051aaa8..817d5e5 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
- * 
+ *
  * 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,43 +11,37 @@ 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");
+	Parser parser = new Parser();
 
-	Parameter testParameter = new Parameter(
-			"Simulate renaming (no changes will be actually done).", "-t",
-			"--test");
+	NullParameter recursiveParameter = parser.add(
+			new NullParameter("Enable recursive mode.")).addAliases("-r",
+			"--recursive");
 
-	Parameter outputPatternParameter = new Parameter(true, true, true,
-			new StringArgument(), "Output pattern.", "-o", "--output-pattern");
+	NullParameter testParameter = parser.add(
+			new NullParameter(
+					"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");
-
-	Parameter workingDirectoryParameter = new Parameter(false, true, true,
-			new ExistingDirectory(), "Working directory.", "-w",
-			"--working-directory");
-
-	public Parser initParser() {
+	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);
+	StringParameters inputPatternParameter = parser.add(
+			new StringParameters("File input pattern.")).addAliases("-i",
+			"--input-pattern");
 
-		return parser;
-	}
+	DirectoryParameter workingDirectoryParameter = parser
+			.add(new DirectoryParameter("Working directory."))
+			.addAliases("-w", "--working-directory").mustExist();
 
 	/**
 	 * @return {@link EncodingOptions} if commandline arguments were
@@ -58,7 +52,6 @@ public class CommandlineHandler {
 
 		final RenamingOptions options = new RenamingOptions();
 
-		final Parser parser = initParser();
 		if (!parser.parse(args))
 			return null;
 
@@ -69,18 +62,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;
 	}