From a5677016393f6fc5ab32aedfc43b701da3241e54 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Sun, 28 Mar 2021 03:43:52 +0430 Subject: [PATCH] chapter image fix for bato.to --- server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt | 7 +++++++ .../src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt | 2 +- server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt | 2 +- server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt | 2 +- .../main/kotlin/ir/armor/tachidesk/impl/{ => util}/File.kt | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) rename server/src/main/kotlin/ir/armor/tachidesk/impl/{ => util}/File.kt (95%) diff --git a/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt b/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt index ed929c7b..cfdfd6d3 100644 --- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt +++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt @@ -126,6 +126,13 @@ fun getChapter(chapterIndex: Int, mangaId: Int): ChapterDataClass { it[this.chapter] = chapterId } } + } else { + transaction { + PageTable.update({ (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }) { + it[url] = page.url + it[imageUrl] = page.imageUrl + } + } } } diff --git a/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt b/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt index ba1baaec..36f43f68 100644 --- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt +++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt @@ -195,7 +195,7 @@ fun getExtensionIcon(apkName: String): Pair { val saveDir = "${applicationDirs.extensionsRoot}/icon" - return getCachedResponse(saveDir, apkName) { + return getCachedImageResponse(saveDir, apkName) { network.client.newCall( GET(iconUrl) ).execute() diff --git a/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt b/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt index 3b700b3a..46449513 100644 --- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt +++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt @@ -93,7 +93,7 @@ fun getThumbnail(mangaId: Int): Pair { val saveDir = applicationDirs.thumbnailsRoot val fileName = mangaId.toString() - return getCachedResponse(saveDir, fileName) { + return getCachedImageResponse(saveDir, fileName) { val sourceId = mangaEntry[MangaTable.sourceReference] val source = getHttpSource(sourceId) var thumbnailUrl = mangaEntry[MangaTable.thumbnail_url] diff --git a/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt b/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt index 3a3878cf..62bd9d30 100644 --- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt +++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt @@ -58,7 +58,7 @@ fun getPageImage(mangaId: Int, chapterIndex: Int, index: Int): Pair Response): Pair { +fun getCachedImageResponse(saveDir: String, fileName: String, fetcher: () -> Response): Pair { val cachedFile = findFileNameStartingWith(saveDir, fileName) val filePath = "$saveDir/$fileName" if (cachedFile != null) {