Support skip-downloading-duplicate-read-chapters for merged entries

(cherry picked from commit e19c62a8aef2203eb287ef2f450c95b642f7f2f0)

app/src/main/java/eu/kanade/domain/DomainModule.kt

@@ -153,7 +153,7 @@ class DomainModule : InjektModule {
         addFactory { ShouldUpdateDbChapter() }
         addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get()) }
         addFactory { GetAvailableScanlators(get()) }
-        addFactory { FilterChaptersForDownload(get(), get(), get()) }
+        addFactory { FilterChaptersForDownload(get(), get(), get(), get()) }
 
         addSingletonFactory<HistoryRepository> { HistoryRepositoryImpl(get()) }
         addFactory { GetHistory(get()) }

app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt

@@ -38,10 +38,7 @@ class MergedSource : HttpSource() {
     private val updateManga: UpdateManga by injectLazy()
     private val sourceManager: SourceManager by injectLazy()
     private val downloadManager: DownloadManager by injectLazy()
-
-    // KMK -->
     private val filterChaptersForDownload: FilterChaptersForDownload by injectLazy()
-    // KMK <--
 
     override val id: Long = MERGED_SOURCE_ID
 
@@ -133,20 +130,17 @@ class MergedSource : HttpSource() {
                                     val (source, loadedManga, reference) = it.load()
                                     if (loadedManga != null && reference.getChapterUpdates) {
                                         val chapterList = source.getChapterList(loadedManga.toSManga())
-                                        val chapters =
+                                        val results =
                                             syncChaptersWithSource.await(chapterList, loadedManga, source)
-                                        // KMK -->
+
-                                        // KMK: this should check if user preferences & manga's categories allowed to download
+                                        if (downloadChapters && reference.downloadChapters) {
-                                        // KMK: the checking for skip duplicated-read chapters might not work for merged mangas but won't affect the download
+                                            val chaptersToDownload = filterChaptersForDownload.await(manga, results)
-                                        val results = filterChaptersForDownload.await(manga, chapters)
+                                            if (chaptersToDownload.isNotEmpty()) {
-                                        if (downloadChapters &&
+                                                downloadManager.downloadChapters(
-                                            // KMK <--
+                                                    loadedManga,
-                                            reference.downloadChapters
+                                                    chaptersToDownload,
-                                        ) {
+                                                )
-                                            downloadManager.downloadChapters(
+                                            }
-                                                loadedManga,
-                                                results,
-                                            )
                                         }
                                         results
                                     } else {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt

@@ -1426,12 +1426,9 @@ class MangaScreenModel(
     private fun downloadNewChapters(chapters: List<Chapter>) {
         screenModelScope.launchNonCancellable {
             val manga = successState?.manga ?: return@launchNonCancellable
-            // EXH -->
-            if (manga.isEhBasedManga()) return@launchNonCancellable
-            // EXH <--
             val chaptersToDownload = filterChaptersForDownload.await(manga, chapters)
 
-            if (chaptersToDownload.isNotEmpty()) {
+            if (chaptersToDownload.isNotEmpty() /* SY --> */ && !manga.isEhBasedManga() /* SY <-- */) {
                 downloadChapters(chaptersToDownload)
             }
         }

domain/src/main/java/mihon/domain/chapter/interactor/FilterChaptersForDownload.kt

@@ -1,7 +1,9 @@
 package mihon.domain.chapter.interactor
 
+import exh.source.MERGED_SOURCE_ID
 import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
+import tachiyomi.domain.chapter.interactor.GetMergedChaptersByMangaId
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.download.service.DownloadPreferences
 import tachiyomi.domain.manga.model.Manga
@@ -15,12 +17,14 @@ import tachiyomi.domain.manga.model.Manga
  */
 class FilterChaptersForDownload(
     private val getChaptersByMangaId: GetChaptersByMangaId,
+    private val getMergedChaptersByMangaId: GetMergedChaptersByMangaId,
     private val downloadPreferences: DownloadPreferences,
     private val getCategories: GetCategories,
 ) {
 
     /**
      * Determines which chapters of a manga should be downloaded based on user preferences.
+     * This should check if user preferences & manga's categories allowed to download
      *
      * @param manga The manga for which chapters may be downloaded.
      * @param newChapters The list of new chapters available for the manga.
@@ -37,7 +41,15 @@ class FilterChaptersForDownload(
 
         if (!downloadPreferences.downloadNewUnreadChaptersOnly().get()) return newChapters
 
-        val readChapterNumbers = getChaptersByMangaId.await(manga.id)
+        // SY -->
+        val existingChapters = if (manga.source == MERGED_SOURCE_ID) {
+            getMergedChaptersByMangaId.await(manga.id)
+        } else {
+            getChaptersByMangaId.await(manga.id)
+        }
+
+        val readChapterNumbers = existingChapters
+            // SY <--
             .asSequence()
             .filter { it.read && it.isRecognizedNumber }
             .map { it.chapterNumber }