Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2026-02-01 20:10:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor inbox folder logic and add JSON config check

Browse Source 
Simplifies chatId extraction and refactors inbox folder selection to use a custom folder suffix only if enabled. Adds a check for the presence of a JSON configuration file in the inbox folder and notifies the user if none is found.
This commit is contained in:
Ludy87 2025-12-10 20:39:20 +01:00
parent 74203bc45b
commit ac14ec9300
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/core/src/main/java/stirling/software/SPDF/service/telegram/TelegramPipelineBot.java
View File

@ -288,8 +288,7 @@ public class TelegramPipelineBot extends TelegramLongPollingBot {
URL downloadUrl = buildDownloadUrl(telegramFile.getFilePath());
Chat chat = message.getChat();
Long chatId = chat != null ? chat.getId() : null;
Long chatId = message.getChat() != null ? message.getChat().getId() : null;
Path baseInbox =
Paths.get(
@ -298,17 +297,22 @@ public class TelegramPipelineBot extends TelegramLongPollingBot {
Files.createDirectories(baseInbox);
Path inboxFolder =
Optional.ofNullable(chatId)
.map(Object::toString)
.map(String::trim)
.filter(StringUtils::isNotBlank)
.map(baseInbox::resolve) // Unterordner: baseInbox + "/" + chatId
.orElse(baseInbox); // fallback: nur der Basisordner
Path inboxFolder = baseInbox;
if (telegramProperties.getCustomFolderSuffix() && chatId != null) {
inboxFolder = baseInbox.resolve(chatId.toString());
}
// Jetzt den eigentlichen Zielordner (mit chatId oder ohne) anlegen
Files.createDirectories(inboxFolder);
boolean hasJsonConfig = Files.list(inboxFolder)
.filter(Files::isRegularFile)
.anyMatch(p -> p.toString().endsWith(".json"));
if (!hasJsonConfig) {
log.info("No JSON configuration file found in inbox folder {}", inboxFolder);
sendMessage(chatId, "No JSON configuration file found in the inbox folder. Please contact the administrator.");
}
String uniqueBaseName = FilenameUtils.getBaseName(originalName) + "-" + UUID.randomUUID();
String extension = FilenameUtils.getExtension(originalName);