Import results directory too (#474)

LabKey · Dec 17, 2024 · 690b326 · 690b326
1 parent 8d4f1a4
commit 690b326
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/nextflow/src/org/labkey/nextflow/pipeline/NextFlowPipelineJob.java b/nextflow/src/org/labkey/nextflow/pipeline/NextFlowPipelineJob.java
@@ -70,9 +70,12 @@ private static Path createConfig(Path configTemplate, Path parentDir, Path jobDi
 
         String webdavUrl = FileContentService.get().getWebDavUrl(parentDir, container, FileContentService.PathType.full);
         webdavUrl = StringUtils.stripEnd(webdavUrl, "/");
-
         String substitutedContent = template.replace("${quant_spectra_dir}", "quant_spectra_dir = '" + webdavUrl + "'");
 
+        String uploadUrl = FileContentService.get().getWebDavUrl(jobDir, container, FileContentService.PathType.full);
+        uploadUrl = StringUtils.stripEnd(uploadUrl, "/");
+        substitutedContent = substitutedContent.replace("${panorama.upload_url}", "panorama.upload_url = '" + uploadUrl + "'");
+
         Path substitutedFile = jobDir.resolve(configTemplate.getFileName());
         try (BufferedWriter writer = Files.newBufferedWriter(substitutedFile))
         {
@@ -116,5 +119,4 @@ public File findOutputFile(String name)
     {
         return null;
     }
-
 }
diff --git a/nextflow/src/org/labkey/nextflow/pipeline/NextFlowProtocol.java b/nextflow/src/org/labkey/nextflow/pipeline/NextFlowProtocol.java
@@ -16,7 +16,7 @@
 public class NextFlowProtocol extends AbstractFileAnalysisProtocol<NextFlowPipelineJob>
 {
     public static final List<FileType> INPUT_TYPES = List.of(
-            new FileType(".RAW"),
+            new FileType(".raw"),
             new FileType(".mzML"));
 
     public NextFlowProtocol()

diff --git a/nextflow/src/org/labkey/nextflow/pipeline/NextFlowRunTask.java b/nextflow/src/org/labkey/nextflow/pipeline/NextFlowRunTask.java
@@ -80,6 +80,7 @@ public NextFlowRunTask(Factory factory, PipelineJob job)
                 action.addInput(inputFile.toFile(), SPECTRA_INPUT_ROLE);
             }
             addOutputs(action, getJob().getLogFilePath().getParent().resolve("reports"));
+            addOutputs(action, getJob().getLogFilePath().getParent().resolve("results"));
             return new RecordedActionSet(action);
         }
         catch (IOException e)