This commit is contained in:
Ludy87 2025-07-13 09:55:44 +02:00
parent a5c0290cfa
commit dae05cb150
No known key found for this signature in database
GPG Key ID: 92696155E0220F94
6 changed files with 14 additions and 13 deletions

View File

@ -79,13 +79,17 @@
".venv*/", ".venv*/",
".vscode/", ".vscode/",
"bin/", "bin/",
"app/core/bin/",
"app/common/bin/", "app/common/bin/",
"app/proprietary/bin/", "app/proprietary/bin/",
"build/", "build/",
"app/core/build/",
"app/common/build/", "app/common/build/",
"app/proprietary/build/", "app/proprietary/build/",
"configs/", "configs/",
"app/core/configs/",
"customFiles/", "customFiles/",
"app/core/customFiles/",
"docs/", "docs/",
"exampleYmlFiles", "exampleYmlFiles",
"gradle/", "gradle/",
@ -97,6 +101,7 @@
".git-blame-ignore-revs", ".git-blame-ignore-revs",
".gitattributes", ".gitattributes",
".gitignore", ".gitignore",
"app/core/.gitignore",
"app/common/.gitignore", "app/common/.gitignore",
"app/proprietary/.gitignore", "app/proprietary/.gitignore",
".pre-commit-config.yaml", ".pre-commit-config.yaml",

View File

@ -95,10 +95,10 @@ class TaskManagerTest {
assertTrue(result.isComplete()); assertTrue(result.isComplete());
assertTrue(result.hasFiles()); assertTrue(result.hasFiles());
assertFalse(result.hasMultipleFiles()); assertFalse(result.hasMultipleFiles());
var resultFiles = result.getAllResultFiles(); var resultFiles = result.getAllResultFiles();
assertEquals(1, resultFiles.size()); assertEquals(1, resultFiles.size());
ResultFile resultFile = resultFiles.get(0); ResultFile resultFile = resultFiles.get(0);
assertEquals(fileId, resultFile.getFileId()); assertEquals(fileId, resultFile.getFileId());
assertEquals(originalFileName, resultFile.getFileName()); assertEquals(originalFileName, resultFile.getFileName());
@ -180,7 +180,7 @@ class TaskManagerTest {
// Arrange // Arrange
// Mock fileStorage.getFileSize for file operations // Mock fileStorage.getFileSize for file operations
when(fileStorage.getFileSize("file-id")).thenReturn(1024L); when(fileStorage.getFileSize("file-id")).thenReturn(1024L);
// 1. Create active job // 1. Create active job
String activeJobId = "active-job"; String activeJobId = "active-job";
taskManager.createTask(activeJobId); taskManager.createTask(activeJobId);
@ -232,7 +232,7 @@ class TaskManagerTest {
LocalDateTime oldTime = LocalDateTime.now().minusHours(1); LocalDateTime oldTime = LocalDateTime.now().minusHours(1);
ReflectionTestUtils.setField(oldJob, "completedAt", oldTime); ReflectionTestUtils.setField(oldJob, "completedAt", oldTime);
ReflectionTestUtils.setField(oldJob, "complete", true); ReflectionTestUtils.setField(oldJob, "complete", true);
// Create a ResultFile and set it using the new approach // Create a ResultFile and set it using the new approach
ResultFile resultFile = ResultFile.builder() ResultFile resultFile = ResultFile.builder()
.fileId("file-id") .fileId("file-id")

View File

@ -13,7 +13,7 @@
<stayAlive>false</stayAlive> <stayAlive>false</stayAlive>
<restartOnCrash>false</restartOnCrash> <restartOnCrash>false</restartOnCrash>
<manifest></manifest> <manifest></manifest>
<icon>./src/main/resources/static/favicon.ico</icon> <icon>./app/core/src/main/resources/static/favicon.ico</icon>
<var>BROWSER_OPEN=true</var> <var>BROWSER_OPEN=true</var>
<singleInstance> <singleInstance>
<mutexName>Stirling-PDF</mutexName> <mutexName>Stirling-PDF</mutexName>
@ -33,4 +33,4 @@
<launcherErr>Java is corrupted. Please uninstall and then install Java 17.</launcherErr> <launcherErr>Java is corrupted. Please uninstall and then install Java 17.</launcherErr>
<instanceAlreadyExistsMsg>Stirling-PDF is already running.</instanceAlreadyExistsMsg> <instanceAlreadyExistsMsg>Stirling-PDF is already running.</instanceAlreadyExistsMsg>
</messages> </messages>
</launch4jConfig> </launch4jConfig>

View File

@ -8,7 +8,7 @@ fi
key_to_remove="$1" key_to_remove="$1"
for file in ../src/main/resources/messages_*.properties; do for file in ../app/core/src/main/resources/messages_*.properties; do
# If the key ends with a dot, remove all keys starting with it # If the key ends with a dot, remove all keys starting with it
if [[ "$key_to_remove" == *. ]]; then if [[ "$key_to_remove" == *. ]]; then
sed -i "/^${key_to_remove//./\\.}/d" "$file" sed -i "/^${key_to_remove//./\\.}/d" "$file"
@ -17,4 +17,4 @@ for file in ../src/main/resources/messages_*.properties; do
sed -i "/^${key_to_remove//./\\.}=/d" "$file" sed -i "/^${key_to_remove//./\\.}=/d" "$file"
fi fi
echo "Updated $file" echo "Updated $file"
done done

View File

@ -4,7 +4,7 @@ translation_key="pdfToPDFA.credit"
old_value="qpdf" old_value="qpdf"
new_value="liibreoffice" new_value="liibreoffice"
for file in ../src/main/resources/messages_*.properties; do for file in ../app/core/src/main/resources/messages_*.properties; do
sed -i "/^$translation_key=/s/$old_value/$new_value/" "$file" sed -i "/^$translation_key=/s/$old_value/$new_value/" "$file"
echo "Updated $file" echo "Updated $file"
done done

View File

@ -4,12 +4,8 @@ plugins {
} }
rootProject.name = 'Stirling PDF' rootProject.name = 'Stirling PDF'
// Define which subprojects exist.
// The first entry corresponds to the 'stirling-pdf' directory but is internally aliased as ':stirling-pdf':
include 'stirling-pdf', 'common', 'proprietary' include 'stirling-pdf', 'common', 'proprietary'
// To let Gradle know where the ':stirling-pdf' module actually resides and to avoid case conflicts,
// we explicitly map the alias to the folder:
project(':stirling-pdf').projectDir = file('app/core') project(':stirling-pdf').projectDir = file('app/core')
project(':common' ).projectDir = file('app/common') project(':common' ).projectDir = file('app/common')
project(':proprietary' ).projectDir = file('app/proprietary') project(':proprietary' ).projectDir = file('app/proprietary')