Fix issue if 'labels' part of filename

ome · Oct 29, 2024 · b2c2b9c · b2c2b9c
1 parent f127eef
commit b2c2b9c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/loci/formats/in/ZarrReader.java b/src/loci/formats/in/ZarrReader.java
@@ -1127,18 +1127,19 @@ private Double getDouble(Map<String, Object> src, String key) {
   public String[] getUsedFiles(boolean noPixels) {
     FormatTools.assertId(currentId, true, 1);
     String zarrRootPath = currentId.substring(0, currentId.indexOf(".zarr") + 5);
+    int rootPathLength = zarrRootPath.length();
     ArrayList<String> usedFiles = new ArrayList<String>();
     reloadOptionsFile(zarrRootPath);
 
     boolean skipPixels = noPixels || !listPixels() || !systemEnvListPixels();
     boolean includeLabels = includeLabels();
     try (Stream<Path> paths = Files.walk(Paths.get(zarrRootPath), FileVisitOption.FOLLOW_LINKS)) {
       paths.filter(Files::isRegularFile) 
-      .forEach(path -> {if ((!skipPixels && includeLabels) || 
-          (!skipPixels && !includeLabels && !path.toString().toLowerCase().contains("labels")) ||
+      .forEach(path -> { if ((!skipPixels && includeLabels) ||
+          (!skipPixels && !includeLabels && !(path.toString().toLowerCase().indexOf("labels")>=rootPathLength)) ||
           (skipPixels && includeLabels && (path.endsWith(".zgroup") || path.endsWith(".zattrs") || path.endsWith(".xml"))) ||
-          (skipPixels && !includeLabels &&  !path.toString().toLowerCase().contains("labels") &&(path.endsWith(".zgroup") || path.endsWith(".zattrs") || path.endsWith(".xml"))))
-        usedFiles.add(path.toFile().getAbsolutePath());
+          (skipPixels && !includeLabels &&  !(path.toString().toLowerCase().indexOf("labels")>=rootPathLength) &&(path.endsWith(".zgroup") || path.endsWith(".zattrs") || path.endsWith(".xml"))))
+          usedFiles.add(path.toFile().getAbsolutePath());
       });
     } catch (IOException e) {
       e.printStackTrace();