use accessor methods for Encoding Options

[meviz.git] / src / main / java / eu / svjatoslav / meviz / encoder / CommandlineHandler.java

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java
index 9b32ebd..d6282c2 100755 (executable)
--- 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,65 +9,50 @@
 
 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.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;
 
 public class CommandlineHandler {
 
        Parser parser = new Parser();
 
-       StringParameter outputFormatParameter = parser
-                       .createStringParameter("Encoding output format.")
+       StringParameters outputFormatParameter = parser
+                       .add(new StringParameters("Encoding output format."))
                        .addAliases("-o", "--output-format").setMandatory();
 
-       NullParameter terminalParameter = parser.createNullParameter(
-                       "Enable popup terminal.").addAliases("--terminal");
+       NullParameter deinterlaceParameter = parser.add(
+                       new NullParameter("Deinterlace video.")).addAliases(
+                       "--deinterlace", "-d");
 
-       NullParameter deinterlaceParameter = parser.createNullParameter(
-                       "Deinterlace video.").addAliases("--deinterlace", "-d");
+       NullParameter testParameter = parser.add(
+                       new NullParameter("Simulate file encoding.")).addAliases("-t",
+                       "--test");
 
-       NullParameter testParameter = parser.createNullParameter(
-                       "Simulate file encoding.").addAliases("-t", "--test");
+       NullParameter recursiveParameter = parser.add(
+                       new NullParameter("Enable recursive mode.")).addAliases("-r",
+                       "--recursive");
 
-       NullParameter recursiveParameter = parser.createNullParameter(
-                       "Enable recursive mode.").addAliases("-r", "--recursive");
+       NullParameter forPortableParameter = parser.add(
+                       new NullParameter("Encode for portable player.")).addAliases("-p",
+                       "--portable");
 
-       StringParameter inputPatternParameter = parser
-                       .createStringParameter("File input pattern.")
+       StringParameters inputPatternParameter = parser
+                       .add(new StringParameters("File input pattern."))
                        .addAliases("-i", "--input-pattern").setMandatory();
 
        DirectoryParameter workingDirectoryParameter = parser
-                       .createDirectoryParameter("Working directory.")
+                       .add(new DirectoryParameter("Working directory."))
                        .addAliases("-w", "--working-directory").mustExist();
 
-       Parameter videoBitrateParameter = parser.createCustomParameter(
-                       new Bitrate(), "Video bitrate.")
-                       .addAliases("-v", "--video-bitrate");
+       BitrateParameter videoBitrateParameter = parser.add(
+                       new BitrateParameter("Video bitrate")).addAliases("-v",
+                       "--video-bitrate");
 
-       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);
-
-               parser.addParameter(videoBitrateParameter);
-
-               return parser;
-       }
+       BitrateParameter audioBitrateParameter = parser.add(
+                       new BitrateParameter("Audio bitrate")).addAliases("-a",
+                       "--audio-bitrate");
 
        /**
         * @return {@link EncodingOptions} if commandline arguments were
@@ -78,43 +63,30 @@ 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 (deinterlaceParameter.isParameterSpecified())
-                       options.deinterlace = true;
+               options.setDeinterlace(deinterlaceParameter.isParameterSpecified());
 
-               if (terminalParameter.isParameterSpecified())
-                       options.terminal = true;
-
-               if (testParameter.isParameterSpecified())
-                       options.testOnly = true;
+               options.setTestOnly(testParameter.isParameterSpecified());
 
                if (outputFormatParameter.isParameterSpecified())
-                       options.outputFormats.addAll(outputFormatParameter
-                                       .getArgumentsAsStrings());
+                       options.getOutputFormats().addAll(outputFormatParameter.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.getArgumentsAsStrings()
-                                                               .get(0).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;
        }