X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2FCommandlineHandler.java;h=ba5459991b42738d21d1ab925da603e83e6066b6;hb=3150dfd568eefef9919ed202fd0cbfc0ab739d97;hp=eb2ac08be8fda85b0192f80b4dd76495ac727012;hpb=a46bdb8da875d21b3598412470d25b727a9baa04;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
index eb2ac08..ba54599 100755
--- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
@@ -9,62 +9,45 @@
 
 package eu.svjatoslav.meviz.encoder;
 
-import eu.svjatoslav.commons.commandline.parameterparser.Parameter;
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
-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;
 
 public class CommandlineHandler {
 
-	Parameter outputFormatParameter = new Parameter(true, true, true,
-			new StringArgument(), "Encoding output format.", "-o",
-			"--output-format");
+	Parser parser = new Parser();
 
-	Parameter terminalParameter = new Parameter("Enable popup terminal.",
-			"--terminal");
+	StringParameter outputFormatParameter = parser
+			.createStringParameter("Encoding output format.")
+			.addAliases("-o", "--output-format").setMandatory();
 
-	Parameter deinterlaceParameter = new Parameter("Deinterlace video.",
-			"--deinterlace", "-d");
+	NullParameter deinterlaceParameter = parser.createNullParameter(
+			"Deinterlace video.").addAliases("--deinterlace", "-d");
 
-	Parameter testParameter = new Parameter("Simulate file encoding.", "-t",
-			"--test");
+	NullParameter testParameter = parser.createNullParameter(
+			"Simulate file encoding.").addAliases("-t", "--test");
 
-	Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-			"-r", "--recursive");
+	NullParameter recursiveParameter = parser.createNullParameter(
+			"Enable recursive mode.").addAliases("-r", "--recursive");
 
-	Parameter inputPatternParameter = new Parameter(true, true, true,
-			new StringArgument(), "File input pattern.", "-i",
-			"--input-pattern");
+	NullParameter forPortableParameter = parser.createNullParameter(
+			"Encode for portable player.").addAliases("-p", "--portable");
 
-	Parameter workingDirectoryParameter = new Parameter(
-			false,
-			true,
-			true,
-			new eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory(),
-			"Working directory.", "-w", "--working-directory");
+	StringParameter inputPatternParameter = parser
+			.createStringParameter("File input pattern.")
+			.addAliases("-i", "--input-pattern").setMandatory();
 
-	Parameter videoBitrateParameter = new Parameter(false, true, false,
-			new Bitrate(), "Video bitrate.", "-v", "--video-bitrate");
+	DirectoryParameter workingDirectoryParameter = parser
+			.createDirectoryParameter("Working directory.")
+			.addAliases("-w", "--working-directory").mustExist();
 
-	public Parser initParser() {
-		final Parser parser = new Parser();
-
-		parser.addParameter(recursiveParameter);
-
-		parser.addParameter(deinterlaceParameter);
-
-		parser.addParameter(testParameter);
-
-		parser.addParameter(terminalParameter);
-
-		parser.addParameter(outputFormatParameter);
-
-		parser.addParameter(inputPatternParameter);
-
-		parser.addParameter(workingDirectoryParameter);
+	BitrateParameter videoBitrateParameter = new BitrateParameter(
+			"Video bitrate");
 
+	public CommandlineHandler() {
+		videoBitrateParameter.addAliases("-v", "--video-bitrate");
 		parser.addParameter(videoBitrateParameter);
-
-		return parser;
 	}
 
 	/**
@@ -76,20 +59,13 @@ public class CommandlineHandler {
 
 		final EncodingOptions options = new EncodingOptions();
 
-		final Parser parser = initParser();
 		parser.parse(args);
 
-		if (recursiveParameter.isParameterSpecified())
-			options.recursive = true;
+		options.recursive = recursiveParameter.isParameterSpecified();
 
-		if (deinterlaceParameter.isParameterSpecified())
-			options.deinterlace = true;
+		options.deinterlace = deinterlaceParameter.isParameterSpecified();
 
-		if (terminalParameter.isParameterSpecified())
-			options.terminal = true;
-
-		if (testParameter.isParameterSpecified())
-			options.testOnly = true;
+		options.testOnly = testParameter.isParameterSpecified();
 
 		if (outputFormatParameter.isParameterSpecified())
 			options.outputFormats.addAll(outputFormatParameter
@@ -103,11 +79,11 @@ public class CommandlineHandler {
 			options.inputPatterns.addAll(inputPatternParameter
 					.getArgumentsAsStrings());
 
+		options.forPortablePlayer = forPortableParameter.isParameterSpecified();
+
 		if (videoBitrateParameter.isParameterSpecified())
 			try {
-				options.videoBitrate = Bitrate.bitrate
-						.valueOf(videoBitrateParameter.getArgumentAsString()
-								.toUpperCase());
+				options.videoBitrate = videoBitrateParameter.getValue();
 			} catch (final Exception e) {
 				System.out
 						.println("Invalid video bitrate. Valid values are: LOW, MEDIUM, HIGH.");