Removed ignored paths configuration

keeps · Dec 5, 2016 · 4559849 · 4559849
1 parent 2d4e12b
commit 4559849
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/org/roda/rodain/core/RodaIn.java b/src/main/java/org/roda/rodain/core/RodaIn.java
@@ -157,11 +157,13 @@ protected Void call() throws Exception {
 
         AppProperties.initialize();
         String ignoredRaw = AppProperties.getAppConfig("app.ignoredFiles");
-        String[] ignored = ignoredRaw.split(",");
-        for (String s : ignored) {
-          IgnoredFilter.addIgnoreRule(s);
+        if(ignoredRaw!=null && !ignoredRaw.trim().equalsIgnoreCase("")){
+          String[] ignored = ignoredRaw.split(",");
+          for (String s : ignored) {
+            IgnoredFilter.addIgnoreRule(s);
+          }
         }
-
+        
         // load the custom fonts
         Font.loadFont(ClassLoader.getSystemResource("fonts/Ubuntu-Regular.ttf").toExternalForm(), 10);
         Font.loadFont(ClassLoader.getSystemResource("fonts/Ubuntu-Medium.ttf").toExternalForm(), 10);

diff --git a/src/main/java/org/roda/rodain/utils/Utils.java b/src/main/java/org/roda/rodain/utils/Utils.java
@@ -265,17 +265,19 @@ public static DescObjMetadata updateTemplate(DescObjMetadata dm) {
   }
 
   public static boolean containsAtLeastOneNotIgnoredFile(Path path) {
+    //LOGGER.error("containsAtLeastOneNotIgnoredFile("+path.toString()+")");
     boolean res = true;
     try {
       if (path.toFile().listFiles().length == 0) {
         res = false;
       } else {
+        /*
         ValidFilesCounter visitor = new ValidFilesCounter();
         Files.walkFileTree(path, visitor);
         int validFiles = visitor.getValidFiles();
         if (validFiles == 0) {
           res = false;
-        }
+        }*/
       }
     } catch (Exception e) {
       LOGGER.debug("Error while checking if directory contains at least on valid file: " + e.getMessage(), e);

diff --git a/src/main/resources/properties/.app.properties b/src/main/resources/properties/.app.properties
@@ -3,7 +3,7 @@
 #########################################################
 # Regular expressions separated by ',' to ignore files.
 # These files won't appear in the explorer and won't be included in the SIPs
-app.ignoredFiles=Thumbs.db,\\.DS_Store,\\..*
+app.ignoredFiles=
 app.helpEnabled=true
 lastClassificationScheme=
 # Force a locale, using the JVM default locale if not defined here