Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-21 16:03:03 +01:00
Code Issues Projects Releases Wiki Activity

fix: scanner crashes if folders are not readable

Browse source 
scanner will also skip files that are not readable

closes #342
This commit is contained in:
Gauthier Roebroeck 2020-10-20 21:34:55 +08:00
parent b9eb6936e9
commit f43a3864f8
1 changed files with 39 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt
View file

@ -6,7 +6,10 @@ import org.gotson.komga.domain.model.Book
import org.gotson.komga.domain.model.Series
import org.gotson.komga.infrastructure.configuration.KomgaProperties
import org.springframework.stereotype.Service
import java.io.IOException
import java.nio.file.FileVisitOption
import java.nio.file.FileVisitResult
import java.nio.file.FileVisitor
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.attribute.BasicFileAttributes
@ -34,25 +37,42 @@ class FileSystemScanner(
lateinit var scannedSeries: Map<Series, List<Book>>
measureTime {
scannedSeries = Files.walk(root, FileVisitOption.FOLLOW_LINKS).use { dirsStream ->
dirsStream.asSequence()
.onEach { logger.trace { "GetSeries file: $it" } }
.filter { !Files.isHidden(it) }
.filter { Files.isDirectory(it) }
.filter { path ->
komgaProperties.librariesScanDirectoryExclusions.none { exclude ->
path.toString().contains(exclude, true)
}
}
.mapNotNull { dir ->
logger.debug { "Processing directory: $dir" }
val books = Files.list(dir).use { dirStream ->
dirStream.asSequence()
.onEach { logger.trace { "GetBooks file: $it" } }
.filter { Files.isRegularFile(it) }
.filter { supportedExtensions.contains(FilenameUtils.getExtension(it.fileName.toString()).toLowerCase()) }
.map {
logger.debug { "Processing file: $it" }
val dirs = mutableListOf<Path>()
Files.walkFileTree(root, setOf(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, object : FileVisitor<Path> {
override fun preVisitDirectory(dir: Path, attrs: BasicFileAttributes?): FileVisitResult {
logger.trace { "preVisit: $dir" }
if (!Files.isHidden(dir) && komgaProperties.librariesScanDirectoryExclusions.any { exclude ->
dir.toString().contains(exclude, true)
}) return FileVisitResult.SKIP_SUBTREE
dirs.add(dir)
return FileVisitResult.CONTINUE
}
override fun visitFile(file: Path?, attrs: BasicFileAttributes?): FileVisitResult = FileVisitResult.CONTINUE
override fun visitFileFailed(file: Path?, exc: IOException?): FileVisitResult {
logger.warn { "Could not access: $file" }
return FileVisitResult.SKIP_SUBTREE
}
override fun postVisitDirectory(dir: Path?, exc: IOException?): FileVisitResult = FileVisitResult.CONTINUE
})
logger.debug { "Found directories: $dirs" }
scannedSeries = dirs
.mapNotNull { dir ->
logger.debug { "Processing directory: $dir" }
val books = Files.list(dir).use { dirStream ->
dirStream.asSequence()
.onEach { logger.trace { "GetBooks file: $it" } }
.filter { Files.isReadable(it) }
.filter { Files.isRegularFile(it) }
.filter { supportedExtensions.contains(FilenameUtils.getExtension(it.fileName.toString()).toLowerCase()) }
.map {
logger.debug { "Processing file: $it" }
Book(
name = FilenameUtils.getBaseName(it.fileName.toString()),
url = it.toUri().toURL(),
@ -74,7 +94,6 @@ class FileSystemScanner(
else dir.getUpdatedTime()
) to books
}.toMap()
}
}.also {
val countOfBooks = scannedSeries.values.sumBy { it.size }
logger.info { "Scanned ${scannedSeries.size} series and $countOfBooks books in $it" }