From 9a9752a6a11c048779533d357e4a3520d7d9bc59 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Sat, 19 Feb 2022 02:57:03 +0330 Subject: [PATCH] no online fetch on backup (#293) * no online fetch on backup * Revert "no online fetch on backup" This reverts commit 09af582b1a3ef77ca62167bc01f7dcc9643329c9. * alternative solution --- .../manga/impl/backup/proto/ProtoBackupExport.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt index 7dd08ef480..7b593e6a1a 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt @@ -7,7 +7,6 @@ package suwayomi.tachidesk.manga.impl.backup.proto * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import kotlinx.coroutines.runBlocking import okio.buffer import okio.gzip import okio.sink @@ -17,7 +16,6 @@ import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction import suwayomi.tachidesk.manga.impl.CategoryManga -import suwayomi.tachidesk.manga.impl.Chapter import suwayomi.tachidesk.manga.impl.backup.BackupFlags import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupCategory @@ -26,6 +24,7 @@ import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSerializer import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSource import suwayomi.tachidesk.manga.model.table.CategoryTable +import suwayomi.tachidesk.manga.model.table.ChapterTable import suwayomi.tachidesk.manga.model.table.MangaStatus import suwayomi.tachidesk.manga.model.table.MangaTable import suwayomi.tachidesk.manga.model.table.SourceTable @@ -76,7 +75,14 @@ object ProtoBackupExport : ProtoBackupBase() { val mangaId = mangaRow[MangaTable.id].value if (flags.includeChapters) { - val chapters = runBlocking { Chapter.getChapterList(mangaId) } + val chapters = transaction { + ChapterTable.select { ChapterTable.manga eq mangaId } + .orderBy(ChapterTable.sourceOrder to SortOrder.DESC) + .map { + ChapterTable.toDataClass(it) + } + } + backupManga.chapters = chapters.map { BackupChapter( it.url,