Changeset 5735 for CMDIValidator

Timestamp:

10/20/14 16:26:44 (10 years ago)

Author:

Oliver Schonefeld

Message:

• expose file filter to command line tool and provide wildcard file natching

Location:

CMDIValidator/trunk/cmdi-validator-tool

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java (modified) (11 diffs)

CMDIValidator/trunk/cmdi-validator-tool/pom.xml

@@ -61 +61 @@
             <artifactId>humanize-slim</artifactId>
             <version>1.1.5</version>
+        </dependency>
+        <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.4</version>
         </dependency>
     </dependencies>

CMDIValidator/trunk/cmdi-validator-tool/src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java

@@ -20 +20 @@
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.PrintWriter;
 import java.util.Locale;
@@ -25 +26 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-
 import net.java.truevfs.access.TFile;
 import net.java.truevfs.access.TVFS;
@@ -38 +38 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68 +69 @@
     private static final char OPT_NO_SCHEMATRON          = 'S';
     private static final char OPT_SCHEMATRON_FILE        = 's';
+    private static final char OPT_FILENAME_FILTER        = 'F';
     private static final char OPT_CHECK_PIDS             = 'p';
     private static final char OPT_CHECK_AND_RESOLVE_PIDS = 'P';
@@ -88 +90 @@
         boolean disableSchematron = false;
         File schematronFile       = null;
+        FileFilter fileFilter     = null;
         boolean checkPids         = false;
         boolean checkAndResolvePids   = false;
@@ -168 +171 @@
                 schematronFile = new File(name);
             }
+            if (line.hasOption(OPT_FILENAME_FILTER)) {
+                String wildcard = line.getOptionValue(OPT_FILENAME_FILTER);
+                if ((wildcard == null) || wildcard.isEmpty()) {
+                    throw new ParseException("invalid argument for -" +
+                            OPT_FILENAME_FILTER);
+                }
+                try {
+                    fileFilter = new WildcardFileFilter(wildcard);
+                } catch (IllegalArgumentException e) {
+                    throw new ParseException("invalid argument for -" +
+                            OPT_FILENAME_FILTER);
+                }
+            }
+
             if (line.hasOption(OPT_CHECK_PIDS)) {
                 checkPids = true;
@@ -223 +240 @@
                     if (estimate && logger.isInfoEnabled()) {
                         logger.debug("counting files ...");
-                        totalFileCount = countFiles(archive);
+                        totalFileCount = countFiles(archive, fileFilter);
                     }
 
@@ -243 +260 @@
                     if (disableSchematron) {
                         builder.disableSchematron();
+                    }
+                    if (fileFilter != null) {
+                        builder.fileFilter(fileFilter);
                     }
 
@@ -438 +458 @@
                 .create(OPT_SCHEMATRON_FILE));
         options.addOptionGroup(g3);
+        options.addOption(OptionBuilder
+                .withDescription("only process filenames matching a wildcard")
+                .hasArg()
+                .withArgName("WILDCARD")
+                .withLongOpt("file-filter")
+                .create(OPT_FILENAME_FILTER));
         OptionGroup g4 = new OptionGroup();
         g4.addOption(OptionBuilder
@@ -452 +478 @@
 
 
-    private static final int countFiles(TFile directory) {
+    private static final int countFiles(TFile directory,
+            FileFilter fileFilter) {
         int count = 0;
         final TFile[] entries = directory.listFiles();
@@ -458 +485 @@
             for (TFile entry : entries) {
                 if (entry.isDirectory()) {
-                    count += countFiles(entry);
+                    count += countFiles(entry, fileFilter);
                 } else {
+                    if ((fileFilter != null) && !fileFilter.accept(entry)) {
+                        continue;
+                    }
                     count++;
                 }