From 0263b9ee4eb33f0ca1ea5795823956b703bf723b Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 8 Jul 2022 21:54:41 -0400 Subject: [PATCH] Minor SY LibraryPresenter cleanup --- .../kanade/tachiyomi/ui/library/LibraryPresenter.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index 631230888..281849d66 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -687,19 +687,19 @@ class LibraryPresenter( val mergedSource = sourceManager.get(MERGED_SOURCE_ID) as MergedSource val mergedMangas = getMergedMangaById.await(manga.id) mergedSource - .getChaptersAsBlockingAsDbChapter(manga.id) + .getChapters(manga.id) .filter { !it.read } - .groupBy { it.manga_id!! } + .groupBy { it.mangaId } .forEach ab@{ (mangaId, chapters) -> val mergedManga = mergedMangas.firstOrNull { it.id == mangaId } ?: return@ab - downloadManager.downloadChapters(mergedManga, chapters) + downloadManager.downloadChapters(mergedManga, chapters.map(Chapter::toDbChapter)) } } else { /* SY --> */ val chapters = if (manga.isEhBasedManga()) { - getChapterByMangaId.await(manga.id).minByOrNull { it.sourceOrder }?.let { chapter -> - if (!chapter.read) listOf(chapter) else emptyList() - } ?: emptyList() + getChapterByMangaId.await(manga.id).minByOrNull { it.sourceOrder } + ?.takeUnless { it.read } + .let(::listOfNotNull) } else /* SY <-- */ getChapterByMangaId.await(manga.id) .filter { !it.read }