diff --git a/pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json b/pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json index 3e8dea7f..3a989296 100644 --- a/pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json +++ b/pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json @@ -5,19 +5,22 @@ "operation": "/api/v1/general/split-pdf-by-sections", "parameters": { "horizontalDivisions": 2, - "verticalDivisions": 2 + "verticalDivisions": 2, + "fileInput": "automated" } }, { "operation": "/api/v1/general/rotate-pdf", "parameters": { - "angle": 90 + "angle": 90, + "fileInput": "automated" } }, { "operation": "/api/v1/misc/auto-rename", "parameters": { - "useFirstTextAsFallback": false + "useFirstTextAsFallback": false, + "fileInput": "automated" } } ], @@ -25,6 +28,6 @@ "outputDir": "{outputFolder}/{folderName}", "outputFileName": "{filename}-{pipelineName}-{date}-{time}" }, - "outputDir": "httpWebRequest", + "outputDir": "{outputFolder}", "outputFileName": "{filename}" } \ No newline at end of file diff --git a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java index 1f84e783..36526e20 100644 --- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java +++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java @@ -48,6 +48,9 @@ public class SecurityConfiguration { @Autowired private LoginAttemptService loginAttemptService; + @Autowired + private FirstLoginFilter firstLoginFilter; + @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); @@ -55,8 +58,8 @@ public class SecurityConfiguration { if(loginEnabledValue) { http.csrf(csrf -> csrf.disable()); - //http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class); - //http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class); + http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class); http .formLogin(formLogin -> formLogin .loginPage("/login") diff --git a/src/main/resources/templates/pipeline.html b/src/main/resources/templates/pipeline.html index 2c848a07..1ca7ce4e 100644 --- a/src/main/resources/templates/pipeline.html +++ b/src/main/resources/templates/pipeline.html @@ -76,6 +76,12 @@
Create a folder where you want your files to be monitored. This is your 'watched folder'.
+The default directory for this is ./pipeline/watchedFolders/
Place any directories you want to be scanned into this folder, this folder should contain multiple folders each for their own tasks and pipelines.
+ +In each directory you want processed (e.g ./pipeline/watchedFolders/officePrinter
), include a JSON configuration file.
This JSON file should specify how you want the files in the directory to be handled (e.g., what operations to perform on them) which can be made, configured and downloaded from Stirling-PDF Pipeline interface.
+ +The system automatically checks the watched folder every minute for new directories and files to process.
+When a directory with a valid JSON configuration file is found, it begins processing the files inside as per the configuration.
+ +Files in each directory are processed according to the instructions in the JSON file.
+This might involve file conversions, data filtering, renaming files, etc. If the output of a step is a zip, this zip will be automatically unzipped as it passes to next process.
+ +After processing, the results are saved in a specified output location. This could be a different folder or location as defined in the JSON file or the default location ./pipeline/finishedFolders/
.
Each processed file is named and organized according to the rules set in the JSON configuration.
+ +Once processing is complete, the original files in the watched folder's directory are removed.
+You can find the processed files in the designated output location.
+ +If there's an error during processing, the system will not delete the original files, allowing you to check and retry if necessary.
+ +As a user, your main tasks are to set up the watched folders, place directories with files for processing, and create the corresponding JSON configuration files.
+The system handles the rest, including scanning, processing, and outputting results.
+ +