From ac99dd55a2991d49f62c3b388582b6a40ee1857d Mon Sep 17 00:00:00 2001 From: akabhirav <108609220+akabhirav@users.noreply.github.com> Date: Tue, 21 Feb 2023 04:40:38 +0530 Subject: [PATCH] Fix random page sent when manga is downloaded (#508) --- .../suwayomi/tachidesk/manga/impl/download/ArchiveProvider.kt | 1 - .../suwayomi/tachidesk/manga/impl/download/FolderProvider.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/ArchiveProvider.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/ArchiveProvider.kt index edf71afe..a64bc1dc 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/ArchiveProvider.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/ArchiveProvider.kt @@ -33,7 +33,6 @@ class ArchiveProvider(mangaId: Int, chapterId: Int) : DownloadedFilesProvider(ma val chapterFolder = File(chapterDir) if (outputFile.exists()) handleExistingCbzFile(outputFile, chapterFolder) - FolderProvider(mangaId, chapterId).download(download, scope, step) withContext(Dispatchers.IO) { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/FolderProvider.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/FolderProvider.kt index 83c91f9e..d0aef893 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/FolderProvider.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/FolderProvider.kt @@ -24,7 +24,7 @@ class FolderProvider(mangaId: Int, chapterId: Int) : DownloadedFilesProvider(man val chapterDir = getChapterDownloadPath(mangaId, chapterId) val folder = File(chapterDir) folder.mkdirs() - val file = folder.listFiles()?.get(index) + val file = folder.listFiles()?.sortedBy { it.name }?.get(index) val fileType = file!!.name.substringAfterLast(".") return Pair(FileInputStream(file).buffered(), "image/$fileType") }