X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2FCommandlineHandler.java;h=dc1601dc30acb56da1a16fec3cdd1cce1b070393;hb=0c8606b2b2bee4d93f383653c283da116ad7fdee;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..dc1601d 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,111 +9,82 @@
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 deinterlaceParameter = new Parameter("Deinterlace video.",
- "--deinterlace", "-d");
+ IntegerParameter targetFramerate = parser
+ .add(new IntegerParameter("Target framerate.").addAliases("-f", "--target-framerate"));
- Parameter testParameter = new Parameter("Simulate file encoding.", "-t",
- "--test");
+ NullParameter deinterlaceParameter = parser.add(new NullParameter("Deinterlace video.")).addAliases("-d",
+ "--deinterlace");
- Parameter recursiveParameter = new Parameter("Enable recursive mode.",
- "-r", "--recursive");
+ NullParameter testParameter = parser.add(new NullParameter("Simulate file encoding.")).addAliases("-t", "--test");
- Parameter inputPatternParameter = new Parameter(true, true, true,
- new StringArgument(), "File input pattern.", "-i",
- "--input-pattern");
+ NullParameter recursiveParameter = parser.add(new NullParameter("Enable recursive mode.")).addAliases("-r",
+ "--recursive");
- Parameter workingDirectoryParameter = new Parameter(
- false,
- true,
- true,
- new eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory(),
- "Working directory.", "-w", "--working-directory");
+ NullParameter forPortableParameter = parser.add(new NullParameter("Encode for portable player.")).addAliases("-p",
+ "--portable");
- Parameter videoBitrateParameter = new Parameter(false, true, false,
- new Bitrate(), "Video bitrate.", "-v", "--video-bitrate");
+ StringParameters inputPatternParameter = parser.add(new StringParameters("File input pattern."))
+ .addAliases("-i", "--input-pattern").setMandatory();
- public Parser initParser() {
- final Parser parser = new Parser();
+ DirectoryParameter workingDirectoryParameter = parser.add(new DirectoryParameter("Working directory."))
+ .addAliases("-w", "--working-directory").mustExist();
- parser.addParameter(recursiveParameter);
+ BitrateParameter videoBitrateParameter = parser.add(new BitrateParameter("Video bitrate")).addAliases("-v",
+ "--video-bitrate");
- parser.addParameter(deinterlaceParameter);
+ BitrateParameter audioBitrateParameter = parser.add(new BitrateParameter("Audio bitrate")).addAliases("-a",
+ "--audio-bitrate");
- parser.addParameter(testParameter);
+ /**
+ * @return {@link EncodingOptions} if commandline arguments were
+ * successfully parsed, or null
if parsing error
+ * occurred.
+ */
+ public EncodingOptions parseCommandlineArguments(final String[] args) {
- parser.addParameter(terminalParameter);
+ final EncodingOptions options = new EncodingOptions();
- parser.addParameter(outputFormatParameter);
+ parser.parse(args);
- parser.addParameter(inputPatternParameter);
+ options.setRecursive(recursiveParameter.isParameterSpecified());
- parser.addParameter(workingDirectoryParameter);
+ options.setDeinterlace(deinterlaceParameter.isParameterSpecified());
- parser.addParameter(videoBitrateParameter);
+ options.setTestOnly(testParameter.isParameterSpecified());
- return parser;
- }
+ if (outputFormatParameter.isParameterSpecified())
+ options.getOutputFormats().addAll(outputFormatParameter.getValue());
- /**
- * @return {@link EncodingOptions} if commandline arguments were
- * successfully parsed, or null
if parsing error
- * occurred.
- */
- public EncodingOptions parseCommandlineArguments(final String[] args) {
+ if (targetFramerate.isParameterSpecified())
+ options.setTargetFps(targetFramerate.getValue());
- final EncodingOptions options = new EncodingOptions();
+ if (workingDirectoryParameter.isParameterSpecified())
+ options.setWorkingDirectory(workingDirectoryParameter.getValue());
- final Parser parser = initParser();
- parser.parse(args);
+ if (inputPatternParameter.isParameterSpecified())
+ options.getInputPatterns().addAll(inputPatternParameter.getValue());
- if (recursiveParameter.isParameterSpecified())
- options.recursive = true;
+ options.setForPortablePlayer(forPortableParameter.isParameterSpecified());
- if (deinterlaceParameter.isParameterSpecified())
- options.deinterlace = true;
+ if (videoBitrateParameter.isParameterSpecified())
+ options.setVideoBitrate(videoBitrateParameter.getValue());
- if (terminalParameter.isParameterSpecified())
- options.terminal = true;
+ if (audioBitrateParameter.isParameterSpecified())
+ options.setAudioBitrate(audioBitrateParameter.getValue());
- if (testParameter.isParameterSpecified())
- options.testOnly = true;
-
- if (outputFormatParameter.isParameterSpecified())
- options.outputFormats.addAll(outputFormatParameter
- .getArgumentsAsStrings());
-
- if (workingDirectoryParameter.isParameterSpecified())
- options.workingDirectory = workingDirectoryParameter
- .getArgumentsAsFiles().get(0);
-
- if (inputPatternParameter.isParameterSpecified())
- options.inputPatterns.addAll(inputPatternParameter
- .getArgumentsAsStrings());
-
- 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;
- }
-
- return options;
- }
+ return options;
+ }
}