changed input file regexp

Author: TomBlock

post-processing-tool/src/main/java/com/bc/fiduceo/post/PostProcessingTool.java

@@ -110,7 +110,7 @@ static PostProcessingContext initializeContext(CommandLine commandLine) throws I
 
     void runPostProcessing() throws Exception {
         final Path inputDirectory = context.getMmdInputDirectory();
-        final Pattern pattern = Pattern.compile("mmd\\d{1,2}.*_.*_.*_\\d{4}-\\d{3}_\\d{4}-\\d{3}.nc");
+        final Pattern pattern = getFileNamePattern();
 
         try (Stream<Path> pathStream = Files.walk(inputDirectory)) {
             final Stream<Path> regularFiles = pathStream.filter(path -> Files.isRegularFile(path));
@@ -132,6 +132,11 @@ static String getDate(CommandLine commandLine, final String optionName) {
         return dateString;
     }
 
+
+    static Pattern getFileNamePattern() {
+        return Pattern.compile("\\w*\\d{1,2}.*_.*_.*_\\d{4}-\\d{3}_\\d{4}-\\d{3}.nc");
+    }
+
     // package access for testing only se 2016-11-28
     static void printUsageTo(OutputStream outputStream) {
         final PrintWriter writer = new PrintWriter(outputStream);

post-processing-tool/src/test/java/com/bc/fiduceo/post/PostProcessingToolTest.java

@@ -42,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import static org.hamcrest.Matchers.equalToIgnoringWhiteSpace;
 import static org.junit.Assert.assertEquals;
@@ -351,6 +352,18 @@ public void testGetVariableRemoveNamesList_twoPostProcessings_duplicateNames() {
         assertTrue(namesList.contains("Hermann"));
     }
 
+    @Test
+    public void testFileNamePattern() {
+        final Pattern pattern = PostProcessingTool.getFileNamePattern();
+
+        assertTrue(pattern.matcher("mmd08_aatsr-en_avhrr-frac-ma_2012-092_2012-092.nc").matches());
+        assertTrue(pattern.matcher("mmd09_slstr-s3a-nt_avhrr-frac-ma_2019-115_2019-115.nc").matches());
+        assertTrue(pattern.matcher("coo_2_slstr-s3a-nt_avhrr-frac-mb_2020-241_2020-241.nc").matches());
+
+        assertFalse(pattern.matcher("NSS.FRAC.M3.D19261.S1708.E1849.B0448586.SV").matches());
+        assertFalse(pattern.matcher("20161122200700-ESACCI-L1C-AVHRR18_G-fv01.0.nc").matches());
+    }
+
     private PostProcessingConfig getConfig() throws Exception {
         final Document document = new Document(root);