Move some interactors to domain module

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

@@ -3,7 +3,6 @@ package eu.kanade.domain
 import eu.kanade.data.source.SourceRepositoryImpl
 import eu.kanade.domain.category.interactor.CreateCategoryWithName
 import eu.kanade.domain.category.interactor.DeleteCategory
-import eu.kanade.domain.category.interactor.GetCategories
 import eu.kanade.domain.category.interactor.RenameCategory
 import eu.kanade.domain.category.interactor.ReorderCategory
 import eu.kanade.domain.category.interactor.ResetCategoryFlags
@@ -15,7 +14,6 @@ import eu.kanade.domain.chapter.interactor.GetChapter
 import eu.kanade.domain.chapter.interactor.GetChapterByMangaId
 import eu.kanade.domain.chapter.interactor.SetMangaDefaultChapterFlags
 import eu.kanade.domain.chapter.interactor.SetReadStatus
-import eu.kanade.domain.chapter.interactor.ShouldUpdateDbChapter
 import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource
 import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay
 import eu.kanade.domain.chapter.interactor.UpdateChapter
@@ -23,11 +21,7 @@ import eu.kanade.domain.download.interactor.DeleteDownload
 import eu.kanade.domain.extension.interactor.GetExtensionLanguages
 import eu.kanade.domain.extension.interactor.GetExtensionSources
 import eu.kanade.domain.extension.interactor.GetExtensionsByType
-import eu.kanade.domain.history.interactor.GetHistory
 import eu.kanade.domain.history.interactor.GetNextChapters
-import eu.kanade.domain.history.interactor.GetTotalReadDuration
-import eu.kanade.domain.history.interactor.RemoveHistory
-import eu.kanade.domain.history.interactor.UpsertHistory
 import eu.kanade.domain.manga.interactor.GetDuplicateLibraryManga
 import eu.kanade.domain.manga.interactor.GetFavorites
 import eu.kanade.domain.manga.interactor.GetLibraryManga
@@ -52,7 +46,6 @@ import eu.kanade.domain.track.interactor.DeleteTrack
 import eu.kanade.domain.track.interactor.GetTracks
 import eu.kanade.domain.track.interactor.GetTracksPerManga
 import eu.kanade.domain.track.interactor.InsertTrack
-import eu.kanade.domain.updates.interactor.GetUpdates
 import tachiyomi.data.category.CategoryRepositoryImpl
 import tachiyomi.data.chapter.ChapterRepositoryImpl
 import tachiyomi.data.history.HistoryRepositoryImpl
@@ -60,12 +53,19 @@ import tachiyomi.data.manga.MangaRepositoryImpl
 import tachiyomi.data.source.SourceDataRepositoryImpl
 import tachiyomi.data.track.TrackRepositoryImpl
 import tachiyomi.data.updates.UpdatesRepositoryImpl
+import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.category.repository.CategoryRepository
+import tachiyomi.domain.chapter.interactor.ShouldUpdateDbChapter
 import tachiyomi.domain.chapter.repository.ChapterRepository
+import tachiyomi.domain.history.interactor.GetHistory
+import tachiyomi.domain.history.interactor.GetTotalReadDuration
+import tachiyomi.domain.history.interactor.RemoveHistory
+import tachiyomi.domain.history.interactor.UpsertHistory
 import tachiyomi.domain.history.repository.HistoryRepository
 import tachiyomi.domain.manga.repository.MangaRepository
 import tachiyomi.domain.source.repository.SourceDataRepository
 import tachiyomi.domain.track.repository.TrackRepository
+import tachiyomi.domain.updates.interactor.GetUpdates
 import tachiyomi.domain.updates.repository.UpdatesRepository
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar

app/src/main/java/eu/kanade/domain/category/interactor/GetCategories.kt

@@ -1,26 +0,0 @@
-package eu.kanade.domain.category.interactor
-
-import kotlinx.coroutines.flow.Flow
-import tachiyomi.domain.category.model.Category
-import tachiyomi.domain.category.repository.CategoryRepository
-
-class GetCategories(
-    private val categoryRepository: CategoryRepository,
-) {
-
-    fun subscribe(): Flow<List<Category>> {
-        return categoryRepository.getAllAsFlow()
-    }
-
-    fun subscribe(mangaId: Long): Flow<List<Category>> {
-        return categoryRepository.getCategoriesByMangaIdAsFlow(mangaId)
-    }
-
-    suspend fun await(): List<Category> {
-        return categoryRepository.getAll()
-    }
-
-    suspend fun await(mangaId: Long): List<Category> {
-        return categoryRepository.getCategoriesByMangaId(mangaId)
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/ShouldUpdateDbChapter.kt

@@ -1,13 +0,0 @@
-package eu.kanade.domain.chapter.interactor
-
-import tachiyomi.domain.chapter.model.Chapter
-
-class ShouldUpdateDbChapter {
-
-    fun await(dbChapter: Chapter, sourceChapter: Chapter): Boolean {
-        return dbChapter.scanlator != sourceChapter.scanlator || dbChapter.name != sourceChapter.name ||
-            dbChapter.dateUpload != sourceChapter.dateUpload ||
-            dbChapter.chapterNumber != sourceChapter.chapterNumber ||
-            dbChapter.sourceOrder != sourceChapter.sourceOrder
-    }
-}

app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt

@@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
 import tachiyomi.data.chapter.ChapterSanitizer
+import tachiyomi.domain.chapter.interactor.ShouldUpdateDbChapter
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.model.NoChaptersException
 import tachiyomi.domain.chapter.model.toChapterUpdate

app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt

@@ -1,14 +0,0 @@
-package eu.kanade.domain.history.interactor
-
-import kotlinx.coroutines.flow.Flow
-import tachiyomi.domain.history.model.HistoryWithRelations
-import tachiyomi.domain.history.repository.HistoryRepository
-
-class GetHistory(
-    private val repository: HistoryRepository,
-) {
-
-    fun subscribe(query: String): Flow<List<HistoryWithRelations>> {
-        return repository.getHistory(query)
-    }
-}

app/src/main/java/eu/kanade/domain/history/interactor/GetTotalReadDuration.kt

@@ -1,12 +0,0 @@
-package eu.kanade.domain.history.interactor
-
-import tachiyomi.domain.history.repository.HistoryRepository
-
-class GetTotalReadDuration(
-    private val repository: HistoryRepository,
-) {
-
-    suspend fun await(): Long {
-        return repository.getTotalReadDuration()
-    }
-}

app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt

@@ -1,21 +0,0 @@
-package eu.kanade.domain.history.interactor
-
-import tachiyomi.domain.history.model.HistoryWithRelations
-import tachiyomi.domain.history.repository.HistoryRepository
-
-class RemoveHistory(
-    private val repository: HistoryRepository,
-) {
-
-    suspend fun awaitAll(): Boolean {
-        return repository.deleteAllHistory()
-    }
-
-    suspend fun await(history: HistoryWithRelations) {
-        repository.resetHistory(history.id)
-    }
-
-    suspend fun await(mangaId: Long) {
-        repository.resetHistoryByMangaId(mangaId)
-    }
-}

app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt

@@ -1,13 +0,0 @@
-package eu.kanade.domain.history.interactor
-
-import tachiyomi.domain.history.model.HistoryUpdate
-import tachiyomi.domain.history.repository.HistoryRepository
-
-class UpsertHistory(
-    private val historyRepository: HistoryRepository,
-) {
-
-    suspend fun await(historyUpdate: HistoryUpdate) {
-        historyRepository.upsertHistory(historyUpdate)
-    }
-}

app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt

@@ -1,17 +0,0 @@
-package eu.kanade.domain.updates.interactor
-
-import kotlinx.coroutines.flow.Flow
-import tachiyomi.domain.updates.model.UpdatesWithRelations
-import tachiyomi.domain.updates.repository.UpdatesRepository
-import java.util.Calendar
-
-class GetUpdates(
-    private val repository: UpdatesRepository,
-) {
-
-    fun subscribe(calendar: Calendar): Flow<List<UpdatesWithRelations>> = subscribe(calendar.time.time)
-
-    fun subscribe(after: Long): Flow<List<UpdatesWithRelations>> {
-        return repository.subscribeAll(after)
-    }
-}