Double awaitList

This commit is contained in:
Roshan Varughese 2024-10-15 01:52:06 +13:00
parent 1a442564df
commit 5af56fb51e
2 changed files with 5 additions and 5 deletions

View File

@ -24,11 +24,10 @@ import okio.gzip
import okio.sink import okio.sink
import tachiyomi.core.common.i18n.stringResource import tachiyomi.core.common.i18n.stringResource
import tachiyomi.core.common.util.system.logcat import tachiyomi.core.common.util.system.logcat
import tachiyomi.data.DatabaseHandler
import tachiyomi.data.manga.MangaMapper
import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.backup.service.BackupPreferences
import tachiyomi.domain.manga.interactor.GetFavorites import tachiyomi.domain.manga.interactor.GetFavorites
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.repository.MangaRepository
import tachiyomi.i18n.MR import tachiyomi.i18n.MR
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
@ -45,7 +44,7 @@ class BackupCreator(
private val parser: ProtoBuf = Injekt.get(), private val parser: ProtoBuf = Injekt.get(),
private val getFavorites: GetFavorites = Injekt.get(), private val getFavorites: GetFavorites = Injekt.get(),
private val backupPreferences: BackupPreferences = Injekt.get(), private val backupPreferences: BackupPreferences = Injekt.get(),
private val handler: DatabaseHandler = Injekt.get(), private val mangaRepository: MangaRepository = Injekt.get(),
private val categoriesBackupCreator: CategoriesBackupCreator = CategoriesBackupCreator(), private val categoriesBackupCreator: CategoriesBackupCreator = CategoriesBackupCreator(),
private val mangaBackupCreator: MangaBackupCreator = MangaBackupCreator(), private val mangaBackupCreator: MangaBackupCreator = MangaBackupCreator(),
@ -81,7 +80,7 @@ class BackupCreator(
val backupManga = backupMangas( val backupManga = backupMangas(
getFavorites.await() + getFavorites.await() +
if (options.readEntries) { if (options.readEntries) {
handler.awaitList { mangasQueries.getReadMangaNotInLibrary(MangaMapper::mapManga) } mangaRepository.getReadMangaNotInLibrary()
} else { } else {
emptyList() emptyList()
}, },

View File

@ -30,7 +30,8 @@ data class BackupOptions(
privateSettings, privateSettings,
) )
fun canCreate() = libraryEntries || categories || readEntries || appSettings || extensionRepoSettings || sourceSettings fun canCreate() =
libraryEntries || categories || readEntries || appSettings || extensionRepoSettings || sourceSettings
companion object { companion object {
val libraryOptions = persistentListOf( val libraryOptions = persistentListOf(