more elegant commandline handling

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

diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
index 1364a13..713e10f 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/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.
@@ -11,43 +11,35 @@ package eu.svjatoslav.meviz.textsplitter;
 
 import java.io.File;
 
-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.StringParameters;
 
 public class CommandlineHandler {
 
-       Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-                       "-r", "--recursive");
+       Parser parser = new Parser();
 
-       Parameter inputPatternParameter = new Parameter(
-                       true,
-                       true,
-                       true,
-                       new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(),
-                       "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");
+       StringParameters fileInputPatternsParameter = parser.add(
+                       new StringParameters("File input pattern.").addAliases("-i",
+                                       "--input-pattern")).setMandatory();
 
-       public Parser initParser() {
+       StringParameters splitPatternsParameter = parser
+                       .add(new StringParameters("File split regular expression."))
+                       .addAliases("-s", "--split-pattern").setMandatory();
 
-               final Parser parser = new Parser();
-               parser.addParameter(recursiveParameter);
-               parser.addParameter(inputPatternParameter);
-               parser.addParameter(workingDirectoryParameter);
-
-               return parser;
-       }
+       DirectoryParameter workingDirectoryParameter = parser.add(
+                       new DirectoryParameter("Working directory.")).addAliases("-w",
+                       "--working-directory");
 
        public TextSplittingOptions parseCommandlineArguments(final String[] args) {
 
                final TextSplittingOptions options = new TextSplittingOptions();
 
-               final Parser parser = initParser();
                if (!parser.parse(args))
                        return null;
 
@@ -55,14 +47,16 @@ public class CommandlineHandler {
                        options.recursive = true;
 
                if (workingDirectoryParameter.isParameterSpecified())
-                       options.targetDirectory = workingDirectoryParameter
-                                       .getArgumentsAsFiles().get(0);
+                       options.targetDirectory = workingDirectoryParameter.getValue();
                else
                        options.targetDirectory = new File(System.getProperty("user.dir"));
 
-               if (inputPatternParameter.isParameterSpecified())
-                       options.inputPatterns.addAll(inputPatternParameter
-                                       .getArgumentsAsStrings());
+               if (fileInputPatternsParameter.isParameterSpecified())
+                       options.fileInputPatterns.addAll(fileInputPatternsParameter
+                                       .getValue());
+
+               if (splitPatternsParameter.isParameterSpecified())
+                       options.textSplitPatterns.addAll(splitPatternsParameter.getValue());
 
                return options;
        }