diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt index ebdba662..1038fa5c 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt @@ -293,12 +293,15 @@ class LocalSource : CatalogueSource { return when (getFormat(chapterFile)) { is Directory -> { Observable.just( - chapterFile.listFiles().orEmpty().sortedBy { it.name }.mapIndexed { index, page -> - Page( - index, - imageUrl = applicationDirs.localMangaRoot + "/" + chapter.url + "/" + page.name - ) - } + chapterFile.listFiles().orEmpty() + .sortedBy { it.name } + .filter { !it.isDirectory && ImageUtil.isImage(it.name, it::inputStream) + .mapIndexed { index, page -> + Page( + index, + imageUrl = applicationDirs.localMangaRoot + "/" + chapter.url + "/" + page.name + ) + } ) } is Zip -> { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt index 151f30d4..ddaa6256 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt @@ -26,7 +26,6 @@ import suwayomi.tachidesk.manga.model.table.MangaTable import suwayomi.tachidesk.manga.model.table.PageTable import suwayomi.tachidesk.manga.model.table.toDataClass - suspend fun getChapterDownloadReady(chapterIndex: Int, mangaId: Int): ChapterDataClass { val chapter = ChapterForDownload(chapterIndex, mangaId)