merge master -Dorg -Ssuccess-only: PR 4248 (Operetta reader: don't ad…

…d directories to the used files list)
snoopycrimecop · Oct 28, 2024 · 96f873b · 96f873b
2 parents cef4fae + 6352741
commit 96f873b
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/components/formats-gpl/src/loci/formats/in/OperettaReader.java b/components/formats-gpl/src/loci/formats/in/OperettaReader.java
@@ -350,10 +350,16 @@ protected void initFile(String id) throws FormatException, IOException {
           LOGGER.trace("Found folder {}", folder);
           if (!checkSuffix(folder, "tiff"))
           {
-            String metadataFile = new Location(path, folder).getAbsolutePath();
-            if (!metadataFile.equals(currentFile.getAbsolutePath())) {
-              metadataFiles.add(metadataFile);
-              LOGGER.trace("Adding metadata file {}", metadataFile);
+            Location metadataLocation = new Location(path, folder);
+            if (!metadataLocation.isDirectory()) {
+              String metadataFile = metadataLocation.getAbsolutePath();
+              if (!metadataFile.equals(currentFile.getAbsolutePath())) {
+                metadataFiles.add(metadataFile);
+                LOGGER.trace("Adding metadata file {}", metadataFile);
+              }
+            }
+            else {
+              LOGGER.debug("Skipping metadata folder {}", metadataLocation);
             }
           }
         }