fix Windows paths

quiltdata · Sep 8, 2024 · cf6b077 · cf6b077
1 parent 73b68b3
commit cf6b077
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/QuiltObserver.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/QuiltObserver.groovy
@@ -116,15 +116,11 @@ class QuiltObserver implements TraceObserver {
 
     String workRelative(Path src) {
         Path source = src.toAbsolutePath().normalize()
-        log.debug("workRelative.source: $source [type: ${source.getClass()}]")
         Path workDir = session.workDir.toAbsolutePath().normalize()
-        log.debug("workRelative.workDir: $workDir [type: ${workDir.getClass()}]")
         try {
             Path subPath = workDir.relativize(source)
-            log.debug("workRelative.subPath: $subPath]")
             // drop first two components, which are the workDir
             Path relPath = subPath.subpath(2, subPath.getNameCount())
-            log.debug("workRelative.relPath: $relPath]")
             return relPath.toString()
         } catch (IllegalArgumentException e) {
             log.error("workRelative.fallback: $e")

diff --git a/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy b/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy
@@ -18,6 +18,7 @@ package nextflow.quilt.nio
 
 import nextflow.quilt.QuiltSpecification
 import nextflow.quilt.QuiltObserver
+import nextflow.quilt.jep.QuiltPackage
 import nextflow.Session
 
 import java.nio.file.Path
@@ -90,7 +91,7 @@ class QuiltObserverTest extends QuiltSpecification {
         expect:
         String relPath = observer.workRelative(source)
         println("relPath: $relPath")
-        relPath == subPath
+        relPath == QuiltPackage.osConvert(subPath)
         println('done')
     }
 
@@ -136,7 +137,7 @@ class QuiltObserverTest extends QuiltSpecification {
         given:
         QuiltObserver observer = makeObserver()
         expect:
-        observer.session.workDir.toString() == './work'
+        observer.session.workDir.toString() == QuiltPackage.osConvert('./work')
         rc == observer.canOverlayPath(Paths.get(path), Paths.get(path))
         where:
         rc    | path