install before readAttributes

quiltdata · Sep 5, 2023 · f166844 · f166844
1 parent 85ff1bc
commit f166844
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/QuiltProduct.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/QuiltProduct.groovy
@@ -231,8 +231,7 @@ ${meta['workflow']['stats']['processes']}
     }
 
     List<Path> match(String glob) throws IOException {
-        String dir = pkg.packageDest()
-        Path folder = Paths.get(dir)
+        Path folder = pkg.install()
         FileSystem fs = FileSystems.getDefault()
         PathMatcher pathMatcher = fs.getPathMatcher("glob:${glob}")
         List<Path> matches = []

diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/nio/QuiltFileSystem.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/nio/QuiltFileSystem.groovy
@@ -107,7 +107,7 @@ final class QuiltFileSystem extends FileSystem implements Closeable {
 
     QuiltFileAttributes readAttributes(QuiltPath path)  {
         //log.debug("QuiltFileAttributes QuiltFileSystem.readAttributes($path)")
-        Path installedPath = path.localPath()
+        Path installedPath = path.localPath(true)
         try {
             BasicFileAttributes attrs = Files.readAttributes(installedPath, BasicFileAttributes)
             return new QuiltFileAttributes(path, path.toString(), attrs)

diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/nio/QuiltPath.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/nio/QuiltPath.groovy
@@ -71,8 +71,8 @@ final class QuiltPath implements Path, Comparable {
         return sub_paths()
     }
 
-    Path localPath() {
-        Path pkgPath = pkg().packageDest()
+    Path localPath(boolean shouldInstall = false) {
+        Path pkgPath = shouldInstall ? pkg().install() : pkg().packageDest()
         assert pkgPath
         return Paths.get(pkgPath.toUriString(), sub_paths())
     }