X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2FCommandlineHandler.java;h=e83b4b87775a4d0382bd901b4dee287896462ec2;hb=3e5c4ae5e9e2a67702e37124ed38cacdbd4fcdf1;hp=fbde5c5b0a546dc6d32eb47aa06d6917571282bd;hpb=6b6927aafa42fefece54df3c05ebd9161993ef52;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 fbde5c5..e83b4b8 100755
--- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/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.
@@ -9,58 +9,44 @@
 
 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.IntegerParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameters;
 
 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");
+	StringParameters outputFormatParameter = parser.add(new StringParameters("Encoding output format."))
+			.addAliases("-o", "--output-format").setMandatory();
 
-	Parameter testParameter = new Parameter("Simulate file encoding.", "-t",
-			"--test");
+	IntegerParameter targetFramerate = parser
+			.add(new IntegerParameter("Target framerate.").addAliases("-f", "--target-framerate"));
 
-	Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-			"-r", "--recursive");
+	NullParameter deinterlaceParameter = parser.add(new NullParameter("Deinterlace video.")).addAliases("-d",
+			"--deinterlace");
 
-	Parameter inputPatternParameter = new Parameter(true, true, true,
-			new StringArgument(), "File input pattern.", "-i",
-			"--input-pattern");
+	NullParameter testParameter = parser.add(new NullParameter("Simulate file encoding.")).addAliases("-t", "--test");
 
-	Parameter workingDirectoryParameter = new Parameter(
-			false,
-			true,
-			true,
-			new eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory(),
-			"Working directory.", "-w", "--working-directory");
+	NullParameter recursiveParameter = parser.add(new NullParameter("Enable recursive mode.")).addAliases("-r",
+			"--recursive");
 
-	Parameter videoBitrateParameter = new Parameter(false, true, false,
-			new Bitrate(), "Video bitrate.", "-v", "--video-bitrate");
+	NullParameter forPortableParameter = parser.add(new NullParameter("Encode for portable player.")).addAliases("-p",
+			"--portable");
 
-	public Parser initParser() {
-		final Parser parser = new Parser();
+	StringParameters inputPatternParameter = parser.add(new StringParameters("File input pattern."))
+			.addAliases("-i", "--input-pattern").setMandatory();
 
-		parser.addParameter(recursiveParameter);
+	DirectoryParameter workingDirectoryParameter = parser.add(new DirectoryParameter("Working directory."))
+			.addAliases("-w", "--working-directory").mustExist();
 
-		parser.addParameter(testParameter);
+	BitrateParameter videoBitrateParameter = parser.add(new BitrateParameter("Video bitrate")).addAliases("-v",
+			"--video-bitrate");
 
-		parser.addParameter(terminalParameter);
-
-		parser.addParameter(outputFormatParameter);
-
-		parser.addParameter(inputPatternParameter);
-
-		parser.addParameter(workingDirectoryParameter);
-
-		parser.addParameter(videoBitrateParameter);
-
-		return parser;
-	}
+	BitrateParameter audioBitrateParameter = parser.add(new BitrateParameter("Audio bitrate")).addAliases("-a",
+			"--audio-bitrate");
 
 	/**
 	 * @return {@link EncodingOptions} if commandline arguments were
@@ -71,40 +57,33 @@ public class CommandlineHandler {
 
 		final EncodingOptions options = new EncodingOptions();
 
-		final Parser parser = initParser();
 		parser.parse(args);
 
-		if (recursiveParameter.isParameterSpecified())
-			options.recursive = true;
+		options.setRecursive(recursiveParameter.isParameterSpecified());
 
-		if (terminalParameter.isParameterSpecified())
-			options.terminal = true;
+		options.setDeinterlace(deinterlaceParameter.isParameterSpecified());
 
-		if (testParameter.isParameterSpecified())
-			options.testOnly = true;
+		options.setTestOnly(testParameter.isParameterSpecified());
 
 		if (outputFormatParameter.isParameterSpecified())
-			options.outputFormats.addAll(outputFormatParameter
-					.getArgumentsAsStrings());
+			options.getOutputFormats().addAll(outputFormatParameter.getValue());
+
+		if (targetFramerate.isParameterSpecified())
+			options.setTargetFps(targetFramerate.getValue());
 
 		if (workingDirectoryParameter.isParameterSpecified())
-			options.workingDirectory = workingDirectoryParameter
-					.getArgumentsAsFiles().get(0);
+			options.setWorkingDirectory(workingDirectoryParameter.getValue());
 
 		if (inputPatternParameter.isParameterSpecified())
-			options.inputPatterns.addAll(inputPatternParameter
-					.getArgumentsAsStrings());
+			options.getInputPatterns().addAll(inputPatternParameter.getValue());
+
+		options.setForPortablePlayer(forPortableParameter.isParameterSpecified());
 
 		if (videoBitrateParameter.isParameterSpecified())
-			try {
-				options.videoBitrate = Bitrate.bitrate
-						.valueOf(videoBitrateParameter.getArgumentAsString()
-								.toUpperCase());
-			} catch (final Exception e) {
-				System.out
-						.println("Invalid video bitrate. Valid values are: LOW, MEDIUM, HIGH.");
-				return null;
-			}
+			options.setVideoBitrate(videoBitrateParameter.getValue());
+
+		if (audioBitrateParameter.isParameterSpecified())
+			options.setAudioBitrate(audioBitrateParameter.getValue());
 
 		return options;
 	}