X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Frenamer%2FCommandlineHandler.java;h=482736a275ff17d544aaec856a476187403d47b0;hb=55413b4e5a1c3fb76d77e20ea67fd29853083c7e;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..482736a 100755
--- a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
@@ -1,87 +1,75 @@
/*
- * 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.
+ * Meviz - Various tools collection to work with multimedia. Author: Svjatoslav Agejenko.
+ * This project is released under Creative Commons Zero (CC0) license.
*/
-package eu.svjatoslav.meviz.renamer;
-import java.io.File;
+package eu.svjatoslav.meviz.renamer;
-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");
+import java.io.File;
- Parameter testParameter = new Parameter(
- "Simulate renaming (no changes will be actually done).", "-t",
- "--test");
+class CommandlineHandler {
- Parameter outputPatternParameter = new Parameter(true, true, true,
- new StringArgument(), "Output pattern.", "-o", "--output-pattern");
+ final Parser parser = new Parser();
- Parameter inputPatternParameter = new Parameter(true, true, true,
- new StringArgument(), "File input pattern.", "-i",
- "--input-pattern");
+ private final NullParameter recursiveParameter = parser.add(
+ new NullParameter("Enable recursive mode.")).addAliases("-r",
+ "--recursive");
- Parameter workingDirectoryParameter = new Parameter(false, true, true,
- new ExistingDirectory(), "Working directory.", "-w",
- "--working-directory");
+ private final NullParameter testParameter = parser.add(
+ new NullParameter(
+ "Simulate renaming (no changes will be actually done)."))
+ .addAliases("-t", "--test");
- public Parser initParser() {
+ private final 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);
+ private final StringParameters inputPatternParameter = parser.add(
+ new StringParameters("File input pattern.")).addAliases("-i",
+ "--input-pattern");
- return parser;
- }
+ private final DirectoryParameter workingDirectoryParameter = parser
+ .add(new DirectoryParameter("Working directory."))
+ .addAliases("-w", "--working-directory").mustExist();
- /**
- * @return {@link EncodingOptions} if commandline arguments were
- * successfully parsed, or null
if parsing error
- * occurred.
- */
- public RenamingOptions parseCommandlineArguments(final String[] args) {
+ /**
+ * @return {@link EncodingOptions} if commandline arguments were
+ * successfully parsed, or null
if parsing error
+ * occurred.
+ */
+ public RenamingOptions parseCommandlineArguments(final String[] args) {
- final RenamingOptions options = new RenamingOptions();
+ final RenamingOptions options = new RenamingOptions();
- final Parser parser = initParser();
- if (!parser.parse(args))
- return null;
+ if (!parser.parse(args))
+ return null;
- if (testParameter.isParameterSpecified())
- options.testOnly = true;
+ if (testParameter.isSpecified())
+ options.testOnly = true;
- if (recursiveParameter.isParameterSpecified())
- options.recursive = true;
+ if (recursiveParameter.isSpecified())
+ options.recursive = true;
- if (outputPatternParameter.isParameterSpecified())
- options.outputPattern = outputPatternParameter
- .getArgumentsAsStrings().get(0);
+ if (outputPatternParameter.isSpecified())
+ options.outputPattern = outputPatternParameter.getValue();
- if (workingDirectoryParameter.isParameterSpecified())
- options.targetDirectory = workingDirectoryParameter
- .getArgumentsAsFiles().get(0);
- else
- options.targetDirectory = new File(System.getProperty("user.dir"));
+ if (workingDirectoryParameter.isSpecified())
+ options.targetDirectory = workingDirectoryParameter.getValue();
+ else
+ options.targetDirectory = new File(System.getProperty("user.dir"));
- if (inputPatternParameter.isParameterSpecified())
- options.inputPatterns.addAll(inputPatternParameter
- .getArgumentsAsStrings());
+ // TODO: add multiple input patterns support
+ if (inputPatternParameter.isSpecified())
+ options.inputPatterns.addAll(inputPatternParameter.getValue());
- return options;
- }
+ return options;
+ }
}