Expose source path

Signed-off-by: Robrecht Cannoodt <[email protected]>

Author: rcannood

modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy

@@ -1940,7 +1940,7 @@ class TaskProcessor {
             if( item instanceof Path || coerceToPath ) {
                 def path = normalizeToPath(item)
                 def target = executor.isForeignFile(path) ? batch.addToForeign(path) : path
-                def holder = new FileHolder(target, path)
+                def holder = new FileHolder(path, target)
                 files << holder
             }
             else {

modules/nf-commons/src/main/nextflow/file/FileHolder.groovy

@@ -40,31 +40,26 @@ class FileHolder  {
 
     final String stageName
 
-    final Path origPath
-
-    FileHolder( Path inputFile, Path origPath = null ) {
+    FileHolder( Path inputFile ) {
         assert inputFile
         this.sourceObj = inputFile
         this.storePath = real(inputFile)
         this.stageName = norm(inputFile.getFileName())
-        this.origPath = origPath
     }
 
-    FileHolder( def origin, Path path, Path origPath = null ) {
+    FileHolder( def origin, Path path ) {
         assert origin != null
         assert path != null
 
         this.sourceObj = origin
         this.storePath = path
         this.stageName = norm(path.getFileName())
-        this.origPath = origPath
     }
 
-    protected FileHolder( def source, Path store, def stageName, Path origPath = null ) {
+    protected FileHolder( def source, Path store, def stageName ) {
         this.sourceObj = source
         this.storePath = store
         this.stageName = norm(stageName)
-        this.origPath = origPath
     }
 
     FileHolder withName( def stageName )  {
@@ -75,7 +70,9 @@ class FileHolder  {
 
     String getStageName() { stageName }
 
-    Path getOrigPath() { origPath }
+    Path getSourcePath() {
+        sourceObj instanceof Path ? sourceObj : null
+    }
 
     @PackageScope
     static FileHolder get( def path, def name = null ) {