Apply code review changes

mihonapp · Aug 20, 2024 · 1a2dce7 · 1a2dce7
1 parent ac2a778
commit 1a2dce7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 42 deletions.
diff --git a/app/src/main/java/eu/kanade/domain/DomainModule.kt b/app/src/main/java/eu/kanade/domain/DomainModule.kt
@@ -24,7 +24,6 @@ import eu.kanade.domain.track.interactor.RefreshTracks
 import eu.kanade.domain.track.interactor.SyncChapterProgressWithTrack
 import eu.kanade.domain.track.interactor.TrackChapter
 import mihon.data.repository.ExtensionRepoRepositoryImpl
-import mihon.domain.chapter.interactor.GetReadChapterCountByMangaIdAndChapterNumber
 import mihon.domain.extensionrepo.interactor.CreateExtensionRepo
 import mihon.domain.extensionrepo.interactor.DeleteExtensionRepo
 import mihon.domain.extensionrepo.interactor.GetExtensionRepo
@@ -151,9 +150,8 @@ class DomainModule : InjektModule {
         addFactory { UpdateChapter(get()) }
         addFactory { SetReadStatus(get(), get(), get(), get()) }
         addFactory { ShouldUpdateDbChapter() }
-        addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
+        addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get(), get()) }
         addFactory { GetAvailableScanlators(get()) }
-        addFactory { GetReadChapterCountByMangaIdAndChapterNumber(get()) }
 
         addSingletonFactory<HistoryRepository> { HistoryRepositoryImpl(get()) }
         addFactory { GetHistory(get()) }

diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
@@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.data.download.DownloadProvider
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.online.HttpSource
-import mihon.domain.chapter.interactor.GetReadChapterCountByMangaIdAndChapterNumber
 import tachiyomi.data.chapter.ChapterSanitizer
 import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
 import tachiyomi.domain.chapter.interactor.ShouldUpdateDbChapter
@@ -37,7 +36,6 @@ class SyncChaptersWithSource(
     private val getChaptersByMangaId: GetChaptersByMangaId,
     private val getExcludedScanlators: GetExcludedScanlators,
     private val downloadPreferences: DownloadPreferences,
-    private val getReadChapterCount: GetReadChapterCountByMangaIdAndChapterNumber,
 ) {
 
     /**
@@ -220,7 +218,10 @@ class SyncChaptersWithSource(
         }
 
         val chaptersToDownload = if (downloadPreferences.downloadUnreadChaptersOnly().get()) {
-            nonExcludedChapters.filter { getReadChapterCount.await(manga.id, it.chapterNumber) == 0L }
+            val groupedDbChapters = dbChapters.groupBy { it.chapterNumber }
+            nonExcludedChapters.filter { chapter ->
+                groupedDbChapters[chapter.chapterNumber]?.none { it.read } ?: true
+            }
         } else {
             nonExcludedChapters
         }

diff --git a/data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt
@@ -127,12 +127,6 @@ class ChapterRepositoryImpl(
         }
     }
 
-    override suspend fun getReadChapterCountByMangaIdAndChapterNumber(mangaId: Long, chapterNumber: Double): Long {
-        return handler.awaitOne {
-            chaptersQueries.getReadChapterCountByMangaIdAndChapterNumber(mangaId, chapterNumber)
-        }
-    }
-
     private fun mapChapter(
         id: Long,
         mangaId: Long,

diff --git a/data/src/main/sqldelight/tachiyomi/data/chapters.sq b/data/src/main/sqldelight/tachiyomi/data/chapters.sq
@@ -118,11 +118,4 @@ SET manga_id = coalesce(:mangaId, manga_id),
 WHERE _id = :chapterId;
 
 selectLastInsertedRowId:
-SELECT last_insert_rowid();
-
-getReadChapterCountByMangaIdAndChapterNumber:
-SELECT COUNT(*)
-FROM chapters
-WHERE manga_id = :mangaId
-AND chapter_number =:chapterNumber
-AND read = 1;
+SELECT last_insert_rowid();
diff --git a/...main/java/mihon/domain/chapter/interactor/GetReadChapterCountByMangaIdAndChapterNumber.kt b/...main/java/mihon/domain/chapter/interactor/GetReadChapterCountByMangaIdAndChapterNumber.kt
diff --git a/domain/src/main/java/tachiyomi/domain/chapter/repository/ChapterRepository.kt b/domain/src/main/java/tachiyomi/domain/chapter/repository/ChapterRepository.kt
@@ -27,6 +27,4 @@ interface ChapterRepository {
     suspend fun getChapterByMangaIdAsFlow(mangaId: Long, applyScanlatorFilter: Boolean = false): Flow<List<Chapter>>
 
     suspend fun getChapterByUrlAndMangaId(url: String, mangaId: Long): Chapter?
-
-    suspend fun getReadChapterCountByMangaIdAndChapterNumber(mangaId: Long, chapterNumber: Double): Long
 }