From 7216b97d92cfe98eb3cd8c557e01de4f201e0182 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Sun, 10 Oct 2021 12:18:21 +0330 Subject: [PATCH] mimic Tachyomi's behaviour more closely, fixes ReadComicOnline (EN) --- .../suwayomi/tachidesk/manga/impl/Manga.kt | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt index ac9098e5..f0345607 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt @@ -73,26 +73,27 @@ object Manga { url = mangaEntry[MangaTable.url] title = mangaEntry[MangaTable.title] } - val fetchedManga = source.fetchMangaDetails(sManga).awaitSingle() + val networkManga = source.fetchMangaDetails(sManga).awaitSingle() + sManga.copyFrom(networkManga) transaction { MangaTable.update({ MangaTable.id eq mangaId }) { - if (fetchedManga.title != mangaEntry[MangaTable.title]) { - val canUpdateTitle = updateMangaDownloadDir(mangaId, fetchedManga.title) + if (sManga.title != mangaEntry[MangaTable.title]) { + val canUpdateTitle = updateMangaDownloadDir(mangaId, sManga.title) if (canUpdateTitle) - it[MangaTable.title] = fetchedManga.title + it[MangaTable.title] = sManga.title } it[MangaTable.initialized] = true - it[MangaTable.artist] = fetchedManga.artist - it[MangaTable.author] = fetchedManga.author - it[MangaTable.description] = truncate(fetchedManga.description, 4096) - it[MangaTable.genre] = fetchedManga.genre - it[MangaTable.status] = fetchedManga.status - if (fetchedManga.thumbnail_url != null && fetchedManga.thumbnail_url.orEmpty().isNotEmpty()) - it[MangaTable.thumbnail_url] = fetchedManga.thumbnail_url + it[MangaTable.artist] = sManga.artist + it[MangaTable.author] = sManga.author + it[MangaTable.description] = truncate(sManga.description, 4096) + it[MangaTable.genre] = sManga.genre + it[MangaTable.status] = sManga.status + if (sManga.thumbnail_url != null && sManga.thumbnail_url.orEmpty().isNotEmpty()) + it[MangaTable.thumbnail_url] = sManga.thumbnail_url it[MangaTable.realUrl] = try { source.mangaDetailsRequest(sManga).url.toString() @@ -116,11 +117,11 @@ object Manga { true, - fetchedManga.artist, - fetchedManga.author, - fetchedManga.description, - fetchedManga.genre.toGenreList(), - MangaStatus.valueOf(fetchedManga.status).name, + sManga.artist, + sManga.author, + sManga.description, + sManga.genre.toGenreList(), + MangaStatus.valueOf(sManga.status).name, mangaEntry[MangaTable.inLibrary], mangaEntry[MangaTable.inLibraryAt], getSource(mangaEntry[MangaTable.sourceReference]),