Minor SY LibraryPresenter cleanup

This commit is contained in:
Jobobby04 2022-07-08 21:54:41 -04:00
parent 66f2ce5854
commit 0263b9ee4e

View File

@ -687,19 +687,19 @@ class LibraryPresenter(
val mergedSource = sourceManager.get(MERGED_SOURCE_ID) as MergedSource val mergedSource = sourceManager.get(MERGED_SOURCE_ID) as MergedSource
val mergedMangas = getMergedMangaById.await(manga.id) val mergedMangas = getMergedMangaById.await(manga.id)
mergedSource mergedSource
.getChaptersAsBlockingAsDbChapter(manga.id) .getChapters(manga.id)
.filter { !it.read } .filter { !it.read }
.groupBy { it.manga_id!! } .groupBy { it.mangaId }
.forEach ab@{ (mangaId, chapters) -> .forEach ab@{ (mangaId, chapters) ->
val mergedManga = mergedMangas.firstOrNull { it.id == mangaId } ?: return@ab val mergedManga = mergedMangas.firstOrNull { it.id == mangaId } ?: return@ab
downloadManager.downloadChapters(mergedManga, chapters) downloadManager.downloadChapters(mergedManga, chapters.map(Chapter::toDbChapter))
} }
} else { } else {
/* SY --> */ /* SY --> */
val chapters = if (manga.isEhBasedManga()) { val chapters = if (manga.isEhBasedManga()) {
getChapterByMangaId.await(manga.id).minByOrNull { it.sourceOrder }?.let { chapter -> getChapterByMangaId.await(manga.id).minByOrNull { it.sourceOrder }
if (!chapter.read) listOf(chapter) else emptyList() ?.takeUnless { it.read }
} ?: emptyList() .let(::listOfNotNull)
} else /* SY <-- */ getChapterByMangaId.await(manga.id) } else /* SY <-- */ getChapterByMangaId.await(manga.id)
.filter { !it.read } .filter { !it.read }