stuff

xdsnet · Jul 9, 2023 · a742c1b · a742c1b
1 parent 6e726ac
commit a742c1b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'stirling.software'
-version = '0.10.3'
+version = '0.11.0'
 sourceCompatibility = '17'
 
 repositories {

diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java
@@ -120,15 +120,13 @@ private void handleDirectory(Path dir) throws Exception {
 				if (config.getOperations() == null || config.getOutputDir() == null || config.getName() == null) {
 					throw new IOException("Invalid JSON format");
 				}
-				logger.info("Parsed PipelineConfig: {}", config);
 			} catch (IOException e) {
 				logger.error("Error parsing PipelineConfig: {}", jsonString, e);
 				return;
 			}
 
 			// For each operation in the pipeline
 			for (PipelineOperation operation : config.getOperations()) {
-				logger.info("Processing operation: {}", operation.toString());
 				// Collect all files based on fileInput
 				File[] files;
 				String fileInput = (String) operation.getParameters().get("fileInput");
@@ -191,13 +189,18 @@ private void handleDirectory(Path dir) throws Exception {
 						    // If the environment variable is not set, use the default value
 						    outputFolder = finishedFoldersDir;
 						}
-
+						logger.info("outputDir 0={}", outputDir);
 						// Replace the placeholders in the outputDir string
 						outputDir = outputDir.replace("{outputFolder}", outputFolder);
 						outputDir = outputDir.replace("{folderName}", dir.toString());
+						logger.info("outputDir 1={}", outputDir);
 						outputDir = outputDir.replace("\\watchedFolders", "");
-						Path outputPath;
-
+						outputDir = outputDir.replace("//watchedFolders", "");
+						outputDir = outputDir.replace("\\\\watchedFolders", "");
+						outputDir = outputDir.replace("/watchedFolders", "");
+
+						Path outputPath; 
+						logger.info("outputDir 2={}", outputDir);
 						if (Paths.get(outputDir).isAbsolute()) {
 						    // If it's an absolute path, use it directly
 						    outputPath = Paths.get(outputDir);
@@ -206,6 +209,7 @@ private void handleDirectory(Path dir) throws Exception {
 						    outputPath = Paths.get(".", outputDir);
 						}
 
+						logger.info("outputPath={}", outputPath);
 
 						if (!Files.exists(outputPath)) {
 							try {

diff --git a/src/main/resources/static/js/pipeline.js b/src/main/resources/static/js/pipeline.js
@@ -74,7 +74,13 @@ document.getElementById('submitConfigBtn').addEventListener('click', function()
 		"pipeline": [{
 			"operation": selectedOperation,
 			"parameters": parameters
-		}]
+		}],
+		  "_examples": {
+		    "outputDir" : "{outputFolder}/{folderName}",
+		    "outputFileName" : "{filename}-{pipelineName}-{date}-{time}"
+		  },
+		  "outputDir" : "httpWebRequest",
+		  "outputFileName" : "{filename}"
 	};
 
 	let pipelineConfigJson = JSON.stringify(pipelineConfig, null, 2);
@@ -340,10 +346,17 @@ document.getElementById('addOperationBtn').addEventListener('click', function()
 		if (validatePipeline() === false) {
 			return;
 		}
+		var pipelineName = document.getElementById('pipelineName').value;
 		let pipelineList = document.getElementById('pipelineList').children;
 		let pipelineConfig = {
-			"name": "uniquePipelineName",
-			"pipeline": []
+			"name": pipelineName,
+			"pipeline": [],
+			  "_examples": {
+			    "outputDir" : "{outputFolder}/{folderName}",
+			    "outputFileName" : "{filename}-{pipelineName}-{date}-{time}"
+			  },
+			  "outputDir" : "httpWebRequest",
+			  "outputFileName" : "{filename}"
 		};
 
 		for (let i = 0; i < pipelineList.length; i++) {
@@ -381,7 +394,7 @@ document.getElementById('addOperationBtn').addEventListener('click', function()
 			while (pipelineList.firstChild) {
 				pipelineList.removeChild(pipelineList.firstChild);
 			}
-
+			document.getElementById('pipelineName').value = pipelineConfig.name
 			pipelineConfig.pipeline.forEach(operationConfig => {
 				let operationsDropdown = document.getElementById('operationsDropdown');
 				operationsDropdown.value = operationConfig.operation;

diff --git a/src/main/resources/templates/pipeline.html b/src/main/resources/templates/pipeline.html
@@ -33,6 +33,10 @@ <h2 class="card-title">Pipeline Configuration</h2>
 
 							<!-- Pipeline Configuration Body -->
 							<div class="card-body">
+								<div class="mb-3">
+									<label for="pipelineName" class="form-label">Pipeline Name</label>
+        							<input type="text" id="pipelineName" class="form-control" placeholder="Enter pipeline name here">
+								</div>
 								<div class="mb-3">
 									<select id="operationsDropdown" class="form-select">
 										<!-- Options will be dynamically populated here -->