DGNum/Stirling-PDF
15
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #1352 from Ludy87/fix_admin_exe_windows

Browse source 
Fix: Initialization Issue and Enhance Configuration Management for Co…
This commit is contained in:
Anthony Stirling 2024-06-01 09:41:54 +01:00 committed by GitHub
commit aa42806a9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
View file

@ -1,8 +1,10 @@
package stirling.software.SPDF.config; package stirling.software.SPDF.config;
import java.io.BufferedReader;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -45,15 +47,27 @@ public class ConfigInitializer
} }
} }
} else { } else {
Path templatePath = // Load the template content from classpath
Paths.get( List<String> templateLines;
getClass() try (InputStream in =
.getClassLoader() getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
.getResource("settings.yml.template") if (in == null) {
.toURI()); throw new FileNotFoundException(
Path userPath = Paths.get("configs", "settings.yml"); "Resource file not found: settings.yml.template");
}
templateLines = new ArrayList<>();
try (var reader = new InputStreamReader(in)) {
try (var bufferedReader = new BufferedReader(reader)) {
String line;
while ((line = bufferedReader.readLine()) != null) {
templateLines.add(line);
}
}
}
}
List<String> templateLines = Files.readAllLines(templatePath); // Read the user settings file if it exists
Path userPath = Paths.get("configs", "settings.yml");
List<String> userLines = List<String> userLines =
Files.exists(userPath) ? Files.readAllLines(userPath) : new ArrayList<>(); Files.exists(userPath) ? Files.readAllLines(userPath) : new ArrayList<>();
@ -87,6 +101,7 @@ public class ConfigInitializer
Files.write(userPath, resultLines); Files.write(userPath, resultLines);
} }
// Ensure the custom settings file exists
Path customSettingsPath = Paths.get("configs", "custom_settings.yml"); Path customSettingsPath = Paths.get("configs", "custom_settings.yml");
if (!Files.exists(customSettingsPath)) { if (!Files.exists(customSettingsPath)) {
Files.createFile(customSettingsPath); Files.createFile(customSettingsPath);