gitea-mirror/BookLore
1
0
Fork 0
mirror of https://github.com/adityachandelgit/BookLore.git synced 2026-02-18 03:07:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(bookdrop): improve file filtering to ignore .caltrash (calibre generated trash file) (#1785)

Browse Source 
Signed-off-by: Balázs Szücs <bszucs1209@gmail.com>
This commit is contained in:
Balázs Szücs
2025-12-07 23:16:53 +01:00
committed by GitHub
parent ad0a99bcbc
commit 5e5bb41585
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
booklore-api/src/main/java/com/adityachandel/booklore/service/bookdrop/BookdropMonitoringService.java
View File

@@ -3,6 +3,7 @@ package com.adityachandel.booklore.service.bookdrop;
import com.adityachandel.booklore.config.AppProperties;
import com.adityachandel.booklore.model.enums.BookFileExtension;
import com.adityachandel.booklore.util.FileService;
import com.adityachandel.booklore.util.FileUtils;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
@@ -147,14 +148,14 @@ public class BookdropMonitoringService {
try (Stream<Path> pathStream = Files.walk(fullPath)) {
pathStream
.filter(Files::isRegularFile)
.filter(path -> !path.getFileName().toString().startsWith("."))
.filter(path -> !FileUtils.shouldIgnore(path))
.filter(path -> BookFileExtension.fromFileName(path.getFileName().toString()).isPresent())
.forEach(path -> eventHandler.enqueueFile(path, StandardWatchEventKinds.ENTRY_CREATE));
} catch (IOException e) {
log.error("Failed to scan new directory: {}", fullPath, e);
}
} else {
if (!(!fullPath.getFileName().toString().isEmpty() && fullPath.getFileName().toString().charAt(0) == '.')) {
if (!FileUtils.shouldIgnore(fullPath)) {
if (BookFileExtension.fromFileName(fullPath.getFileName().toString()).isPresent()) {
eventHandler.enqueueFile(fullPath, kind);
} else {
@@ -188,7 +189,7 @@ public class BookdropMonitoringService {
private void scanExistingBookdropFiles() {
try (Stream<Path> files = Files.walk(bookdrop)) {
files.filter(Files::isRegularFile)
.filter(path -> !(!path.getFileName().toString().isEmpty() && path.getFileName().toString().charAt(0) == '.'))
.filter(path -> !FileUtils.shouldIgnore(path))
.filter(path -> BookFileExtension.fromFileName(path.getFileName().toString()).isPresent())
.forEach(file -> {
log.info("Found existing supported file on startup: {}", file);

2
booklore-api/src/main/java/com/adityachandel/booklore/service/library/LibraryFileHelper.java
View File

@@ -34,6 +34,7 @@ public class LibraryFileHelper {
try (Stream<Path> stream = Files.walk(libraryPath, FileVisitOption.FOLLOW_LINKS)) {
return stream.filter(Files::isRegularFile)
.filter(path -> !FileUtils.shouldIgnore(path))
.map(fullPath -> {
String fileName = fullPath.getFileName().toString();
Optional<BookFileExtension> bookExtension = BookFileExtension.fromFileName(fileName);
@@ -51,7 +52,6 @@ public class LibraryFileHelper {
.build();
})
.filter(Objects::nonNull)
.filter(file -> !file.getFileName().startsWith("."))
.toList();
}
}

12
booklore-api/src/main/java/com/adityachandel/booklore/util/FileUtils.java
View File

@@ -59,4 +59,16 @@ public class FileUtils {
.forEach(File::delete);
}
}
public boolean shouldIgnore(Path path) {
if (!path.getFileName().toString().isEmpty() && path.getFileName().toString().charAt(0) == '.') {
return true;
}
for (Path part : path) {
if (".caltrash".equals(part.toString())) {
return true;
}
}
return false;
}
}