Release v1.9.3

(cherry picked from commit d94270ce32)

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v1.9.0)
+  - To the latest version of the app (stable is v1.9.3)
   - All extensions
 - I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -53,7 +53,7 @@ body:
       label: Tachiyomi version
       description: You can find your Tachiyomi version in **More → About**.
       placeholder: |
-        Example: "1.9.0"
+        Example: "1.9.3"
     validations:
       required: true
 
@@ -100,7 +100,7 @@ body:
           required: true
         - label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[1.9.0](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.9.3](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
           required: true
         - label: I have updated all installed extensions.
           required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -33,7 +33,7 @@ body:
           required: true
         - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[1.9.0](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.9.3](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true

.github/workflows/build_push.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Build app and run unit tests
         uses: gradle/gradle-command-action@v2
         with:
-          arguments: assembleStandardRelease testStandardReleaseUnitTest --stacktrace
+          arguments: lintKotlin assembleStandardRelease testStandardReleaseUnitTest --stacktrace
 
       - name: Sign APK
         uses: r0adkll/sign-android-release@v1

app/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jmailen.gradle.kotlinter.tasks.LintTask
 
@@ -8,8 +7,8 @@ plugins {
     kotlin("android")
     kotlin("plugin.parcelize")
     kotlin("plugin.serialization")
-    id("com.github.zellius.shortcut-helper")
+    //id("com.github.zellius.shortcut-helper")
-    id("com.squareup.sqldelight")
+    id("com.github.ben-manes.versions")
 }
 
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
@@ -18,21 +17,17 @@ if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
     apply(plugin = "com.google.firebase.crashlytics")
 }
 
-shortcutHelper.setFilePath("./shortcuts.xml")
+//shortcutHelper.setFilePath("./shortcuts.xml")
 
 val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 
 android {
     namespace = "eu.kanade.tachiyomi"
-    compileSdk = AndroidConfig.compileSdk
-    ndkVersion = AndroidConfig.ndk
 
     defaultConfig {
         applicationId = "eu.kanade.tachiyomi.sy"
-        minSdk = AndroidConfig.minSdk
+        versionCode = 50
-        targetSdk = AndroidConfig.targetSdk
+        versionName = "1.9.3"
-        versionCode = 46
-        versionName = "1.9.0"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
@@ -138,32 +133,16 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = compose.versions.compiler.get()
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-
-        isCoreLibraryDesugaringEnabled = true
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    sqldelight {
-        database("Database") {
-            packageName = "eu.kanade.tachiyomi"
-            dialect = "sqlite:3.24"
-        }
-    }
 }
 
 dependencies {
     implementation(project(":i18n"))
     implementation(project(":core"))
     implementation(project(":source-api"))
-
+    implementation(project(":data"))
-    coreLibraryDesugaring(libs.desugar)
+    implementation(project(":domain"))
+    implementation(project(":presentation-core"))
+    implementation(project(":presentation-widget"))
 
     // Compose
     implementation(platform(compose.bom))
@@ -186,9 +165,6 @@ dependencies {
     implementation(androidx.paging.compose)
 
     implementation(libs.bundles.sqlite)
-    implementation(libs.sqldelight.android.driver)
-    implementation(libs.sqldelight.coroutines)
-    implementation(libs.sqldelight.android.paging)
 
     implementation(kotlinx.reflect)
 
@@ -205,7 +181,6 @@ dependencies {
     implementation(androidx.splashscreen)
     implementation(androidx.recyclerview)
     implementation(androidx.viewpager)
-    implementation(androidx.glance)
     implementation(androidx.profileinstaller)
 
     implementation(androidx.bundles.lifecycle)
@@ -315,12 +290,6 @@ androidComponents {
 }
 
 tasks {
-    withType<Test> {
-        useJUnitPlatform()
-        testLogging {
-            events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
-        }
-    }
 
     withType<LintTask>().configureEach {
         exclude { it.file.path.contains("generated[\\\\/]".toRegex()) }
@@ -358,11 +327,6 @@ tasks {
             )
         }
     }
-
-    preBuild {
-        val ktlintTask = if (System.getenv("GITHUB_BASE_REF") == null) formatKotlin else lintKotlin
-        dependsOn(ktlintTask)
-    }
 }
 
 buildscript {

app/proguard-rules.pro

@@ -62,6 +62,14 @@
     kotlinx.serialization.KSerializer serializer(...);
 }
 
+-keep,includedescriptorclasses class tachiyomi.**$$serializer { *; }
+-keepclassmembers class tachiyomi.** {
+    *** Companion;
+}
+-keepclasseswithmembers class tachiyomi.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
 -keep,includedescriptorclasses class exh.**$$serializer { *; }
 -keepclassmembers class exh.** {
     *** Companion;

app/src/main/AndroidManifest.xml

@@ -194,7 +194,7 @@
             android:exported="false" />
 
         <receiver
-            android:name=".glance.UpdatesGridGlanceReceiver"
+            android:name="tachiyomi.presentation.widget.UpdatesGridGlanceReceiver"
             android:enabled="@bool/glance_appwidget_available"
             android:exported="false"
             android:label="@string/label_recent_updates">

app/src/main/java/eu/kanade/core/prefs/PreferenceMutableState.kt

@@ -2,10 +2,10 @@ package eu.kanade.core.prefs
 
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import eu.kanade.tachiyomi.core.preference.Preference
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import tachiyomi.core.preference.Preference
 
 class PreferenceMutableState<T>(
     private val preference: Preference<T>,

app/src/main/java/eu/kanade/data/source/EHentaiPagingSource.kt

@@ -5,8 +5,8 @@ import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.MetadataMangasPage
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.all.EHentai
-import eu.kanade.tachiyomi.util.lang.awaitSingle
 import exh.metadata.metadata.base.RaisedSearchMetadata
+import tachiyomi.core.util.lang.awaitSingle
 
 abstract class EHentaiPagingSource(override val source: EHentai) : SourcePagingSource(source) {
 

app/src/main/java/eu/kanade/data/source/NoResultsException.kt

@@ -1,3 +0,0 @@
-package eu.kanade.data.source
-
-class NoResultsException : Exception()

app/src/main/java/eu/kanade/data/source/SourceMapper.kt

@@ -1,9 +1,8 @@
 package eu.kanade.data.source
 
-import eu.kanade.domain.source.model.Source
-import eu.kanade.domain.source.model.SourceData
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.SourceManager
+import tachiyomi.domain.source.model.Source
 
 val sourceMapper: (eu.kanade.tachiyomi.source.Source) -> Source = { source ->
     Source(
@@ -18,7 +17,3 @@ val sourceMapper: (eu.kanade.tachiyomi.source.Source) -> Source = { source ->
 val catalogueSourceMapper: (CatalogueSource) -> Source = { source ->
     sourceMapper(source).copy(supportsLatest = source.supportsLatest)
 }
-
-val sourceDataMapper: (Long, String, String) -> SourceData = { id, lang, name ->
-    SourceData(id, lang, name)
-}

app/src/main/java/eu/kanade/data/source/SourcePagingSource.kt

@@ -7,9 +7,9 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.MetadataMangasPage
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.util.lang.awaitSingle
-import eu.kanade.tachiyomi.util.lang.withIOContext
 import exh.metadata.metadata.base.RaisedSearchMetadata
+import tachiyomi.core.util.lang.awaitSingle
+import tachiyomi.core.util.lang.withIOContext
 
 abstract class SourcePagingSource(
     protected open val source: CatalogueSource,
@@ -83,3 +83,5 @@ class SourceLatestPagingSource(source: CatalogueSource) : SourcePagingSource(sou
         return source.fetchLatestUpdates(currentPage).awaitSingle()
     }
 }
+
+class NoResultsException : Exception()

app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt

@@ -1,9 +1,6 @@
 package eu.kanade.data.source
 
-import eu.kanade.data.DatabaseHandler
-import eu.kanade.domain.source.model.Source
 import eu.kanade.domain.source.model.SourcePagingSourceType
-import eu.kanade.domain.source.model.SourceWithCount
 import eu.kanade.domain.source.repository.SourceRepository
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.LocalSource
@@ -13,6 +10,9 @@ import eu.kanade.tachiyomi.source.online.all.EHentai
 import exh.source.MERGED_SOURCE_ID
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import tachiyomi.data.DatabaseHandler
+import tachiyomi.domain.source.model.Source
+import tachiyomi.domain.source.model.SourceWithCount
 
 class SourceRepositoryImpl(
     private val sourceManager: SourceManager,

app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt

@@ -1,28 +0,0 @@
-package eu.kanade.data.updates
-
-import eu.kanade.domain.manga.model.MangaCover
-import eu.kanade.domain.updates.model.UpdatesWithRelations
-
-val updateWithRelationMapper: (Long, String, Long, String, String?, Boolean, Boolean, Long, Boolean, String?, Long, Long, Long) -> UpdatesWithRelations = {
-        mangaId, mangaTitle, chapterId, chapterName, scanlator, read, bookmark, sourceId, favorite, thumbnailUrl, coverLastModified, _, dateFetch ->
-    UpdatesWithRelations(
-        mangaId = mangaId,
-        // SY -->
-        ogMangaTitle = mangaTitle,
-        // SY <--
-        chapterId = chapterId,
-        chapterName = chapterName,
-        scanlator = scanlator,
-        read = read,
-        bookmark = bookmark,
-        sourceId = sourceId,
-        dateFetch = dateFetch,
-        coverData = MangaCover(
-            mangaId = mangaId,
-            sourceId = sourceId,
-            isMangaFavorite = favorite,
-            url = thumbnailUrl,
-            lastModified = coverLastModified,
-        ),
-    )
-}

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

@@ -1,16 +1,8 @@
 package eu.kanade.domain
 
-import eu.kanade.data.category.CategoryRepositoryImpl
-import eu.kanade.data.chapter.ChapterRepositoryImpl
-import eu.kanade.data.history.HistoryRepositoryImpl
-import eu.kanade.data.manga.MangaRepositoryImpl
-import eu.kanade.data.source.SourceDataRepositoryImpl
 import eu.kanade.data.source.SourceRepositoryImpl
-import eu.kanade.data.track.TrackRepositoryImpl
-import eu.kanade.data.updates.UpdatesRepositoryImpl
 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
@@ -18,26 +10,18 @@ import eu.kanade.domain.category.interactor.SetDisplayModeForCategory
 import eu.kanade.domain.category.interactor.SetMangaCategories
 import eu.kanade.domain.category.interactor.SetSortModeForCategory
 import eu.kanade.domain.category.interactor.UpdateCategory
-import eu.kanade.domain.category.repository.CategoryRepository
 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
-import eu.kanade.domain.chapter.repository.ChapterRepository
 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.history.repository.HistoryRepository
 import eu.kanade.domain.manga.interactor.GetDuplicateLibraryManga
 import eu.kanade.domain.manga.interactor.GetFavorites
 import eu.kanade.domain.manga.interactor.GetLibraryManga
@@ -48,7 +32,6 @@ import eu.kanade.domain.manga.interactor.ResetViewerFlags
 import eu.kanade.domain.manga.interactor.SetMangaChapterFlags
 import eu.kanade.domain.manga.interactor.SetMangaViewerFlags
 import eu.kanade.domain.manga.interactor.UpdateManga
-import eu.kanade.domain.manga.repository.MangaRepository
 import eu.kanade.domain.source.interactor.GetEnabledSources
 import eu.kanade.domain.source.interactor.GetLanguagesWithSources
 import eu.kanade.domain.source.interactor.GetRemoteManga
@@ -58,15 +41,32 @@ import eu.kanade.domain.source.interactor.SetMigrateSorting
 import eu.kanade.domain.source.interactor.ToggleLanguage
 import eu.kanade.domain.source.interactor.ToggleSource
 import eu.kanade.domain.source.interactor.ToggleSourcePin
-import eu.kanade.domain.source.repository.SourceDataRepository
 import eu.kanade.domain.source.repository.SourceRepository
 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.track.repository.TrackRepository
+import tachiyomi.data.category.CategoryRepositoryImpl
-import eu.kanade.domain.updates.interactor.GetUpdates
+import tachiyomi.data.chapter.ChapterRepositoryImpl
-import eu.kanade.domain.updates.repository.UpdatesRepository
+import tachiyomi.data.history.HistoryRepositoryImpl
+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
 import uy.kohesive.injekt.api.addFactory

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

@@ -1,10 +1,6 @@
 package eu.kanade.domain
 
-import eu.kanade.data.manga.FavoritesEntryRepositoryImpl
+import android.app.Application
-import eu.kanade.data.manga.MangaMergeRepositoryImpl
-import eu.kanade.data.manga.MangaMetadataRepositoryImpl
-import eu.kanade.data.source.FeedSavedSearchRepositoryImpl
-import eu.kanade.data.source.SavedSearchRepositoryImpl
 import eu.kanade.domain.chapter.interactor.DeleteChapters
 import eu.kanade.domain.chapter.interactor.GetChapterByUrl
 import eu.kanade.domain.chapter.interactor.GetMergedChapterByMangaId
@@ -37,9 +33,6 @@ import eu.kanade.domain.manga.interactor.InsertMergedReference
 import eu.kanade.domain.manga.interactor.ReorderSortTag
 import eu.kanade.domain.manga.interactor.SetMangaFilteredScanlators
 import eu.kanade.domain.manga.interactor.UpdateMergedSettings
-import eu.kanade.domain.manga.repository.FavoritesEntryRepository
-import eu.kanade.domain.manga.repository.MangaMergeRepository
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
 import eu.kanade.domain.source.interactor.CountFeedSavedSearchBySourceId
 import eu.kanade.domain.source.interactor.CountFeedSavedSearchGlobal
 import eu.kanade.domain.source.interactor.CreateSourceCategory
@@ -63,10 +56,22 @@ import eu.kanade.domain.source.interactor.InsertSavedSearch
 import eu.kanade.domain.source.interactor.RenameSourceCategory
 import eu.kanade.domain.source.interactor.SetSourceCategories
 import eu.kanade.domain.source.interactor.ToggleExcludeFromDataSaver
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
-import eu.kanade.domain.source.repository.SavedSearchRepository
 import eu.kanade.tachiyomi.source.online.MetadataSource
 import exh.search.SearchEngine
+import tachiyomi.data.manga.CustomMangaRepositoryImpl
+import tachiyomi.data.manga.FavoritesEntryRepositoryImpl
+import tachiyomi.data.manga.MangaMergeRepositoryImpl
+import tachiyomi.data.manga.MangaMetadataRepositoryImpl
+import tachiyomi.data.source.FeedSavedSearchRepositoryImpl
+import tachiyomi.data.source.SavedSearchRepositoryImpl
+import tachiyomi.domain.manga.interactor.GetCustomMangaInfo
+import tachiyomi.domain.manga.interactor.SetCustomMangaInfo
+import tachiyomi.domain.manga.repository.CustomMangaRepository
+import tachiyomi.domain.manga.repository.FavoritesEntryRepository
+import tachiyomi.domain.manga.repository.MangaMergeRepository
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
+import tachiyomi.domain.source.repository.SavedSearchRepository
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
 import uy.kohesive.injekt.api.addFactory
@@ -148,5 +153,9 @@ class SYDomainModule : InjektModule {
         addFactory { CountFeedSavedSearchBySourceId(get()) }
         addFactory { GetSavedSearchGlobalFeed(get()) }
         addFactory { GetSavedSearchBySourceIdFeed(get()) }
+
+        addSingletonFactory<CustomMangaRepository> { CustomMangaRepositoryImpl(get<Application>()) }
+        addFactory { GetCustomMangaInfo(get()) }
+        addFactory { SetCustomMangaInfo(get()) }
     }
 }

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

@@ -1,6 +1,6 @@
 package eu.kanade.domain
 
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.PreferenceStore
 
 class UnsortedPreferences(
     private val preferenceStore: PreferenceStore,

app/src/main/java/eu/kanade/domain/backup/service/BackupPreferences.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.backup.service
 
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.provider.FolderProvider
+import tachiyomi.core.provider.FolderProvider
 
 class BackupPreferences(
     private val folderProvider: FolderProvider,

app/src/main/java/eu/kanade/domain/base/BasePreferences.kt

@@ -1,12 +1,9 @@
 package eu.kanade.domain.base
 
 import android.content.Context
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.preference.getEnum
-import eu.kanade.tachiyomi.data.preference.PreferenceValues
-import eu.kanade.tachiyomi.util.system.DeviceUtil
 import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import eu.kanade.tachiyomi.util.system.isReleaseBuildType
+import tachiyomi.core.preference.PreferenceStore
 
 class BasePreferences(
     val context: Context,
@@ -21,10 +18,7 @@ class BasePreferences(
 
     fun automaticExtUpdates() = preferenceStore.getBoolean("automatic_ext_updates", true)
 
-    fun extensionInstaller() = preferenceStore.getEnum(
+    fun extensionInstaller() = ExtensionInstallerPreference(context, preferenceStore)
-        "extension_installer",
-        if (DeviceUtil.isMiui) PreferenceValues.ExtensionInstaller.LEGACY else PreferenceValues.ExtensionInstaller.PACKAGEINSTALLER,
-    )
 
     fun acraEnabled() = preferenceStore.getBoolean("acra.enable", isPreviewBuildType || isReleaseBuildType)
 }

app/src/main/java/eu/kanade/domain/base/ExtensionInstallerPreference.kt

@@ -0,0 +1,68 @@
+package eu.kanade.domain.base
+
+import android.content.Context
+import eu.kanade.tachiyomi.data.preference.PreferenceValues.ExtensionInstaller
+import eu.kanade.tachiyomi.util.system.hasMiuiPackageInstaller
+import eu.kanade.tachiyomi.util.system.isShizukuInstalled
+import kotlinx.coroutines.CoroutineScope
+import tachiyomi.core.preference.Preference
+import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.getEnum
+
+class ExtensionInstallerPreference(
+    private val context: Context,
+    preferenceStore: PreferenceStore,
+) : Preference<ExtensionInstaller> {
+
+    private val basePref = preferenceStore.getEnum(key(), defaultValue())
+
+    override fun key() = "extension_installer"
+
+    val entries get() = ExtensionInstaller.values().run {
+        if (context.hasMiuiPackageInstaller) {
+            filter { it != ExtensionInstaller.PACKAGEINSTALLER }
+        } else {
+            toList()
+        }
+    }
+
+    override fun defaultValue() = if (context.hasMiuiPackageInstaller) {
+        ExtensionInstaller.LEGACY
+    } else {
+        ExtensionInstaller.PACKAGEINSTALLER
+    }
+
+    private fun check(value: ExtensionInstaller): ExtensionInstaller {
+        when (value) {
+            ExtensionInstaller.PACKAGEINSTALLER -> {
+                if (context.hasMiuiPackageInstaller) return ExtensionInstaller.LEGACY
+            }
+            ExtensionInstaller.SHIZUKU -> {
+                if (!context.isShizukuInstalled) return defaultValue()
+            }
+            else -> {}
+        }
+        return value
+    }
+
+    override fun get(): ExtensionInstaller {
+        val value = basePref.get()
+        val checkedValue = check(value)
+        if (value != checkedValue) {
+            basePref.set(checkedValue)
+        }
+        return checkedValue
+    }
+
+    override fun set(value: ExtensionInstaller) {
+        basePref.set(check(value))
+    }
+
+    override fun isSet() = basePref.isSet()
+
+    override fun delete() = basePref.delete()
+
+    override fun changes() = basePref.changes()
+
+    override fun stateIn(scope: CoroutineScope) = basePref.stateIn(scope)
+}

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

@@ -1,12 +1,11 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.model.Category
-import eu.kanade.domain.category.model.anyWithName
-import eu.kanade.domain.category.repository.CategoryRepository
 import eu.kanade.domain.library.service.LibraryPreferences
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.category.repository.CategoryRepository
 
 class CreateCategoryWithName(
     private val categoryRepository: CategoryRepository,
@@ -23,10 +22,6 @@ class CreateCategoryWithName(
 
     suspend fun await(name: String): Result = withNonCancellableContext {
         val categories = categoryRepository.getAll()
-        if (categories.anyWithName(name)) {
-            return@withNonCancellableContext Result.NameAlreadyExistsError
-        }
-
         val nextOrder = categories.maxOfOrNull { it.order }?.plus(1) ?: 0
         val newCategory = Category(
             id = 0,
@@ -49,7 +44,6 @@ class CreateCategoryWithName(
         data class Success(val category: Category) : Result()
 
         // SY <--
-        object NameAlreadyExistsError : Result()
         data class InternalError(val error: Throwable) : Result()
     }
 }

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

@@ -1,10 +1,10 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.model.CategoryUpdate
-import eu.kanade.domain.category.repository.CategoryRepository
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.category.model.CategoryUpdate
+import tachiyomi.domain.category.repository.CategoryRepository
 
 class DeleteCategory(
     private val categoryRepository: CategoryRepository,

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

@@ -1,23 +1,17 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.model.Category
-import eu.kanade.domain.category.model.CategoryUpdate
-import eu.kanade.domain.category.model.anyWithName
-import eu.kanade.domain.category.repository.CategoryRepository
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.category.model.CategoryUpdate
+import tachiyomi.domain.category.repository.CategoryRepository
 
 class RenameCategory(
     private val categoryRepository: CategoryRepository,
 ) {
 
     suspend fun await(categoryId: Long, name: String) = withNonCancellableContext {
-        val categories = categoryRepository.getAll()
-        if (categories.anyWithName(name)) {
-            return@withNonCancellableContext Result.NameAlreadyExistsError
-        }
-
         val update = CategoryUpdate(
             id = categoryId,
             name = name,
@@ -36,7 +30,6 @@ class RenameCategory(
 
     sealed class Result {
         object Success : Result()
-        object NameAlreadyExistsError : Result()
         data class InternalError(val error: Throwable) : Result()
     }
 }

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

@@ -1,13 +1,13 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.model.Category
-import eu.kanade.domain.category.model.CategoryUpdate
-import eu.kanade.domain.category.repository.CategoryRepository
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.category.model.CategoryUpdate
+import tachiyomi.domain.category.repository.CategoryRepository
 import java.util.Collections
 
 class ReorderCategory(

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

@@ -1,8 +1,8 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.repository.CategoryRepository
-import eu.kanade.domain.library.model.plus
 import eu.kanade.domain.library.service.LibraryPreferences
+import tachiyomi.domain.category.repository.CategoryRepository
+import tachiyomi.domain.library.model.plus
 
 class ResetCategoryFlags(
     private val preferences: LibraryPreferences,

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

@@ -1,12 +1,12 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.model.Category
-import eu.kanade.domain.category.model.CategoryUpdate
-import eu.kanade.domain.category.repository.CategoryRepository
-import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.library.model.LibraryGroup
-import eu.kanade.domain.library.model.plus
 import eu.kanade.domain.library.service.LibraryPreferences
+import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.category.model.CategoryUpdate
+import tachiyomi.domain.category.repository.CategoryRepository
+import tachiyomi.domain.library.model.LibraryDisplayMode
+import tachiyomi.domain.library.model.plus
 
 class SetDisplayModeForCategory(
     private val preferences: LibraryPreferences,

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

@@ -1,8 +1,8 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.manga.repository.MangaRepository
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class SetMangaCategories(
     private val mangaRepository: MangaRepository,

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

@@ -1,12 +1,12 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.model.Category
-import eu.kanade.domain.category.model.CategoryUpdate
-import eu.kanade.domain.category.repository.CategoryRepository
 import eu.kanade.domain.library.model.LibraryGroup
-import eu.kanade.domain.library.model.LibrarySort
-import eu.kanade.domain.library.model.plus
 import eu.kanade.domain.library.service.LibraryPreferences
+import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.category.model.CategoryUpdate
+import tachiyomi.domain.category.repository.CategoryRepository
+import tachiyomi.domain.library.model.LibrarySort
+import tachiyomi.domain.library.model.plus
 
 class SetSortModeForCategory(
     private val preferences: LibraryPreferences,

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

@@ -1,8 +1,8 @@
 package eu.kanade.domain.category.interactor
 
-import eu.kanade.domain.category.model.CategoryUpdate
+import tachiyomi.core.util.lang.withNonCancellableContext
-import eu.kanade.domain.category.repository.CategoryRepository
+import tachiyomi.domain.category.model.CategoryUpdate
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
+import tachiyomi.domain.category.repository.CategoryRepository
 
 class UpdateCategory(
     private val categoryRepository: CategoryRepository,

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

@@ -1,6 +1,6 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.repository.ChapterRepository
+import tachiyomi.domain.chapter.repository.ChapterRepository
 
 class DeleteChapters(
     private val chapterRepository: ChapterRepository,

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

@@ -1,9 +1,9 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.repository.ChapterRepository
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.chapter.repository.ChapterRepository
 
 class GetChapter(
     private val chapterRepository: ChapterRepository,

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

@@ -1,9 +1,9 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.repository.ChapterRepository
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.chapter.repository.ChapterRepository
 
 class GetChapterByMangaId(
     private val chapterRepository: ChapterRepository,

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

@@ -1,9 +1,9 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.repository.ChapterRepository
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.chapter.repository.ChapterRepository
 
 class GetChapterByUrl(
     private val chapterRepository: ChapterRepository,

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

@@ -1,15 +1,15 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.repository.ChapterRepository
 import eu.kanade.domain.manga.interactor.GetMergedReferencesById
-import eu.kanade.tachiyomi.util.system.logcat
-import exh.merged.sql.models.MergedMangaReference
 import exh.source.MERGED_SOURCE_ID
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flowOf
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.chapter.repository.ChapterRepository
+import tachiyomi.domain.manga.model.MergedMangaReference
 
 class GetMergedChapterByMangaId(
     private val chapterRepository: ChapterRepository,

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

@@ -3,8 +3,8 @@ package eu.kanade.domain.chapter.interactor
 import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.domain.manga.interactor.GetFavorites
 import eu.kanade.domain.manga.interactor.SetMangaChapterFlags
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.core.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
+import tachiyomi.domain.manga.model.Manga
 
 class SetMangaDefaultChapterFlags(
     private val libraryPreferences: LibraryPreferences,

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

@@ -1,16 +1,16 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.model.ChapterUpdate
-import eu.kanade.domain.chapter.repository.ChapterRepository
 import eu.kanade.domain.download.interactor.DeleteDownload
 import eu.kanade.domain.download.service.DownloadPreferences
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import exh.source.MERGED_SOURCE_ID
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.chapter.model.ChapterUpdate
+import tachiyomi.domain.chapter.repository.ChapterRepository
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class SetReadStatus(
     private val downloadPreferences: DownloadPreferences,

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

@@ -1,12 +1,9 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.data.chapter.CleanupChapterName
+import eu.kanade.domain.chapter.model.copyFromSChapter
-import eu.kanade.data.chapter.NoChaptersException
+import eu.kanade.domain.chapter.model.toSChapter
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.model.toChapterUpdate
-import eu.kanade.domain.chapter.repository.ChapterRepository
 import eu.kanade.domain.manga.interactor.UpdateManga
-import eu.kanade.domain.manga.model.Manga
+import eu.kanade.domain.manga.model.toSManga
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.DownloadProvider
 import eu.kanade.tachiyomi.source.Source
@@ -15,6 +12,13 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
 import exh.source.isEhBasedManga
+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
+import tachiyomi.domain.chapter.repository.ChapterRepository
+import tachiyomi.domain.manga.model.Manga
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.lang.Long.max
@@ -53,7 +57,7 @@ class SyncChaptersWithSource(
             .mapIndexed { i, sChapter ->
                 Chapter.create()
                     .copyFromSChapter(sChapter)
-                    .copy(name = CleanupChapterName.await(sChapter.name, manga.title))
+                    .copy(name = with(ChapterSanitizer) { sChapter.name.sanitize(manga.title) })
                     .copy(mangaId = manga.id, sourceOrder = i.toLong())
             }
 

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

@@ -1,13 +1,13 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.model.toChapterUpdate
 import eu.kanade.domain.track.interactor.InsertTrack
-import eu.kanade.domain.track.model.Track
 import eu.kanade.domain.track.model.toDbTrack
 import eu.kanade.tachiyomi.data.track.TrackService
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.chapter.model.toChapterUpdate
+import tachiyomi.domain.track.model.Track
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 

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

@@ -1,9 +1,9 @@
 package eu.kanade.domain.chapter.interactor
 
-import eu.kanade.domain.chapter.model.ChapterUpdate
-import eu.kanade.domain.chapter.repository.ChapterRepository
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.chapter.model.ChapterUpdate
+import tachiyomi.domain.chapter.repository.ChapterRepository
 
 class UpdateChapter(
     private val chapterRepository: ChapterRepository,

app/src/main/java/eu/kanade/domain/chapter/model/Chapter.kt

@@ -2,64 +2,30 @@ package eu.kanade.domain.chapter.model
 
 import eu.kanade.tachiyomi.data.database.models.ChapterImpl
 import eu.kanade.tachiyomi.source.model.SChapter
+import tachiyomi.domain.chapter.model.Chapter
 import eu.kanade.tachiyomi.data.database.models.Chapter as DbChapter
 
-data class Chapter(
+// TODO: Remove when all deps are migrated
-    val id: Long,
+fun Chapter.toSChapter(): SChapter {
-    val mangaId: Long,
+    return SChapter.create().also {
-    val read: Boolean,
+        it.url = url
-    val bookmark: Boolean,
+        it.name = name
-    val lastPageRead: Long,
+        it.date_upload = dateUpload
-    val dateFetch: Long,
+        it.chapter_number = chapterNumber
-    val sourceOrder: Long,
+        it.scanlator = scanlator
-    val url: String,
-    val name: String,
-    val dateUpload: Long,
-    val chapterNumber: Float,
-    val scanlator: String?,
-) {
-    val isRecognizedNumber: Boolean
-        get() = chapterNumber >= 0f
-
-    fun toSChapter(): SChapter {
-        return SChapter.create().also {
-            it.url = url
-            it.name = name
-            it.date_upload = dateUpload
-            it.chapter_number = chapterNumber
-            it.scanlator = scanlator
-        }
-    }
-
-    fun copyFromSChapter(sChapter: SChapter): Chapter {
-        return this.copy(
-            name = sChapter.name,
-            url = sChapter.url,
-            dateUpload = sChapter.date_upload,
-            chapterNumber = sChapter.chapter_number,
-            scanlator = sChapter.scanlator?.ifBlank { null },
-        )
-    }
-
-    companion object {
-        fun create() = Chapter(
-            id = -1,
-            mangaId = -1,
-            read = false,
-            bookmark = false,
-            lastPageRead = 0,
-            dateFetch = 0,
-            sourceOrder = 0,
-            url = "",
-            name = "",
-            dateUpload = -1,
-            chapterNumber = -1f,
-            scanlator = null,
-        )
     }
 }
 
-// TODO: Remove when all deps are migrated
+fun Chapter.copyFromSChapter(sChapter: SChapter): Chapter {
+    return this.copy(
+        name = sChapter.name,
+        url = sChapter.url,
+        dateUpload = sChapter.date_upload,
+        chapterNumber = sChapter.chapter_number,
+        scanlator = sChapter.scanlator?.ifBlank { null },
+    )
+}
+
 fun Chapter.toDbChapter(): DbChapter = ChapterImpl().also {
     it.id = id
     it.manga_id = mangaId

app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt

@@ -1,13 +1,15 @@
 package eu.kanade.domain.chapter.model
 
-import eu.kanade.domain.manga.model.Manga
+import eu.kanade.domain.manga.model.downloadedFilter
-import eu.kanade.domain.manga.model.TriStateFilter
 import eu.kanade.domain.manga.model.isLocal
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.ui.manga.ChapterItem
 import eu.kanade.tachiyomi.util.chapter.getChapterSort
 import exh.md.utils.MdUtil
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.TriStateFilter
 
 /**
  * Applies the view filters to the list of chapters obtained from the database.
@@ -47,7 +49,7 @@ fun List<Chapter>.applyFilters(manga: Manga, downloadManager: DownloadManager):
         }
         // SY -->
         .filter { chapter ->
-            manga.filteredScanlators.isNullOrEmpty() || MdUtil.getScanlators(chapter.scanlator).any { group -> manga.filteredScanlators.contains(group) }
+            manga.filteredScanlators.isNullOrEmpty() || MdUtil.getScanlators(chapter.scanlator).any { group -> manga.filteredScanlators!!.contains(group) }
         }
         // SY <--
         .sortedWith(getChapterSort(manga))
@@ -86,7 +88,7 @@ fun List<ChapterItem>.applyFilters(manga: Manga): Sequence<ChapterItem> {
         }
         // SY -->
         .filter { chapter ->
-            manga.filteredScanlators.isNullOrEmpty() || MdUtil.getScanlators(chapter.chapter.scanlator).any { group -> manga.filteredScanlators.contains(group) }
+            manga.filteredScanlators.isNullOrEmpty() || MdUtil.getScanlators(chapter.chapter.scanlator).any { group -> manga.filteredScanlators!!.contains(group) }
         }
         // SY <--
         .sortedWith { (chapter1), (chapter2) -> getChapterSort(manga).invoke(chapter1, chapter2) }

app/src/main/java/eu/kanade/domain/download/interactor/DeleteDownload.kt

@@ -1,10 +1,10 @@
 package eu.kanade.domain.download.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.manga.model.Manga
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.manga.model.Manga
 
 class DeleteDownload(
     private val sourceManager: SourceManager,

app/src/main/java/eu/kanade/domain/download/service/DownloadPreferences.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.download.service
 
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.provider.FolderProvider
+import tachiyomi.core.provider.FolderProvider
 
 class DownloadPreferences(
     private val folderProvider: FolderProvider,

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

@@ -1,7 +1,7 @@
 package eu.kanade.domain.history.interactor
 
-import eu.kanade.domain.history.model.History
+import tachiyomi.domain.history.model.History
-import eu.kanade.domain.history.repository.HistoryRepository
+import tachiyomi.domain.history.repository.HistoryRepository
 
 class GetHistoryByMangaId(
     private val repository: HistoryRepository,

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

@@ -2,12 +2,12 @@ package eu.kanade.domain.history.interactor
 
 import eu.kanade.domain.chapter.interactor.GetChapterByMangaId
 import eu.kanade.domain.chapter.interactor.GetMergedChapterByMangaId
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.history.repository.HistoryRepository
 import eu.kanade.domain.manga.interactor.GetManga
 import eu.kanade.tachiyomi.util.chapter.getChapterSort
 import exh.source.MERGED_SOURCE_ID
 import exh.source.isEhBasedManga
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.history.repository.HistoryRepository
 import kotlin.math.max
 
 class GetNextChapters(

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

@@ -1,13 +0,0 @@
-package eu.kanade.domain.history.interactor
-
-import eu.kanade.domain.history.model.HistoryUpdate
-import eu.kanade.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/library/service/LibraryPreferences.kt

@@ -1,17 +1,17 @@
 package eu.kanade.domain.library.service
 
 import eu.kanade.domain.library.model.GroupLibraryMode
-import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.library.model.LibraryGroup
-import eu.kanade.domain.library.model.LibrarySort
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.preference.getEnum
 import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
 import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
 import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
 import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
+import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.getEnum
+import tachiyomi.domain.library.model.LibraryDisplayMode
+import tachiyomi.domain.library.model.LibrarySort
+import tachiyomi.domain.manga.model.Manga
 
 class LibraryPreferences(
     private val preferenceStore: PreferenceStore,
@@ -25,7 +25,7 @@ class LibraryPreferences(
 
     fun landscapeColumns() = preferenceStore.getInt("pref_library_columns_landscape_key", 0)
 
-    fun libraryUpdateInterval() = preferenceStore.getInt("pref_library_update_interval_key", 24)
+    fun libraryUpdateInterval() = preferenceStore.getInt("pref_library_update_interval_key", 0)
     fun libraryUpdateLastTimestamp() = preferenceStore.getLong("library_update_last_timestamp", 0L)
 
     fun libraryUpdateDeviceRestriction() = preferenceStore.getStringSet("library_update_restriction", setOf(DEVICE_ONLY_ON_WIFI))
@@ -63,8 +63,6 @@ class LibraryPreferences(
 
     fun localBadge() = preferenceStore.getBoolean("display_local_badge", true)
 
-    fun unreadBadge() = preferenceStore.getBoolean("display_unread_badge", true)
-
     fun languageBadge() = preferenceStore.getBoolean("display_language_badge", false)
 
     fun newShowUpdatesCount() = preferenceStore.getBoolean("library_show_updates_count", true)

app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMergeRepository
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class DeleteByMergeId(
     private val mangaMergeRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.FavoritesEntryRepository
+import tachiyomi.domain.manga.repository.FavoritesEntryRepository
 
 class DeleteFavoriteEntries(
     private val favoriteEntryRepository: FavoritesEntryRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMangaById.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class DeleteMangaById(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMergeRepository
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class DeleteMergeById(
     private val mangaMergeRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetAllManga.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class GetAllManga(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetDuplicateLibraryManga.kt

@@ -1,13 +1,13 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class GetDuplicateLibraryManga(
     private val mangaRepository: MangaRepository,
 ) {
 
-    suspend fun await(title: String, sourceId: Long): Manga? {
+    suspend fun await(title: String): Manga? {
-        return mangaRepository.getDuplicateLibraryManga(title.lowercase(), sourceId)
+        return mangaRepository.getDuplicateLibraryManga(title.lowercase())
     }
 }

app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
 
 class GetExhFavoriteMangaWithMetadata(
     private val mangaMetadataRepository: MangaMetadataRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.FavoritesEntryRepository
+import tachiyomi.domain.manga.model.FavoriteEntry
-import exh.favorites.sql.models.FavoriteEntry
+import tachiyomi.domain.manga.repository.FavoritesEntryRepository
 
 class GetFavoriteEntries(
     private val favoriteEntryRepository: FavoritesEntryRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetFavorites.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
 import kotlinx.coroutines.flow.Flow
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class GetFavorites(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt

@@ -1,12 +1,12 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
 import eu.kanade.tachiyomi.source.online.MetadataSource
-import eu.kanade.tachiyomi.util.system.logcat
 import exh.metadata.metadata.base.FlatMetadata
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
 
 class GetFlatMetadataById(
     private val mangaMetadataRepository: MangaMetadataRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
 
 class GetIdsOfFavoriteMangaWithMetadata(
     private val mangaMetadataRepository: MangaMetadataRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetLibraryManga.kt

@@ -1,8 +1,10 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.library.model.LibraryManga
-import eu.kanade.domain.manga.repository.MangaRepository
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.retry
+import tachiyomi.domain.library.model.LibraryManga
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class GetLibraryManga(
     private val mangaRepository: MangaRepository,
@@ -14,5 +16,15 @@ class GetLibraryManga(
 
     fun subscribe(): Flow<List<LibraryManga>> {
         return mangaRepository.getLibraryMangaAsFlow()
+            // SY -->
+            .let {
+                var retries = 0
+                it.retry {
+                    (retries++ < 3) && it is NullPointerException
+                }.onEach {
+                    retries = 0
+                }
+            }
+        // SY <--
     }
 }

app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt

@@ -1,11 +1,11 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
 import eu.kanade.tachiyomi.source.online.MetadataSource
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class GetManga(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaBySource.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class GetMangaBySource(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaWithChapters.kt

@@ -1,11 +1,11 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.chapter.model.Chapter
-import eu.kanade.domain.chapter.repository.ChapterRepository
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.chapter.repository.ChapterRepository
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class GetMangaWithChapters(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt

@@ -1,10 +1,10 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaMergeRepository
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class GetMergedManga(
     private val mangaMergeRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt

@@ -1,10 +1,10 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaMergeRepository
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class GetMergedMangaById(
     private val mangaMergeRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaMergeRepository
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class GetMergedMangaForDownloading(
     private val mangaMergeRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedReferencesById.kt

@@ -1,10 +1,10 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMergeRepository
-import eu.kanade.tachiyomi.util.system.logcat
-import exh.merged.sql.models.MergedMangaReference
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.manga.model.MergedMangaReference
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class GetMergedReferencesById(
     private val mangaMergeRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt

@@ -1,12 +1,14 @@
 package eu.kanade.domain.manga.interactor
 
 import eu.kanade.domain.chapter.interactor.GetChapterByMangaId
-import eu.kanade.domain.manga.model.Manga
+import eu.kanade.domain.chapter.model.toSChapter
 import eu.kanade.domain.manga.model.PagePreview
+import eu.kanade.domain.manga.model.toSManga
 import eu.kanade.tachiyomi.data.cache.PagePreviewCache
 import eu.kanade.tachiyomi.source.PagePreviewSource
 import eu.kanade.tachiyomi.source.Source
 import exh.source.getMainSource
+import tachiyomi.domain.manga.model.Manga
 
 class GetPagePreviews(
     private val pagePreviewCache: PagePreviewCache,

app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
 import exh.metadata.sql.models.SearchMetadata
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
 
 class GetSearchMetadata(
     private val mangaMetadataRepository: MangaMetadataRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
 import exh.metadata.sql.models.SearchTag
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
 
 class GetSearchTags(
     private val mangaMetadataRepository: MangaMetadataRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
 import exh.metadata.sql.models.SearchTitle
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
 
 class GetSearchTitles(
     private val mangaMetadataRepository: MangaMetadataRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.FavoritesEntryRepository
+import tachiyomi.domain.manga.model.FavoriteEntry
-import exh.favorites.sql.models.FavoriteEntry
+import tachiyomi.domain.manga.repository.FavoritesEntryRepository
 
 class InsertFavoriteEntries(
     private val favoriteEntryRepository: FavoritesEntryRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt

@@ -1,11 +1,11 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMetadataRepository
 import eu.kanade.tachiyomi.source.online.MetadataSource
-import eu.kanade.tachiyomi.util.system.logcat
 import exh.metadata.metadata.base.FlatMetadata
 import exh.metadata.metadata.base.RaisedSearchMetadata
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.manga.repository.MangaMetadataRepository
 
 class InsertFlatMetadata(
     private val mangaMetadataRepository: MangaMetadataRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaMergeRepository
+import tachiyomi.domain.manga.model.MergedMangaReference
-import exh.merged.sql.models.MergedMangaReference
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class InsertMergedReference(
     private val mangaMergedRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/NetworkToLocalManga.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class NetworkToLocalManga(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/ResetViewerFlags.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class ResetViewerFlags(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.model.MangaUpdate
+import tachiyomi.domain.manga.model.MangaUpdate
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class SetMangaChapterFlags(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.Manga
-import eu.kanade.domain.manga.model.MangaUpdate
+import tachiyomi.domain.manga.model.MangaUpdate
-import eu.kanade.domain.manga.repository.MangaRepository
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class SetMangaFilteredScanlators(private val mangaRepository: MangaRepository) {
 

app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt

@@ -1,9 +1,9 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.MangaUpdate
-import eu.kanade.domain.manga.repository.MangaRepository
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
+import tachiyomi.domain.manga.model.MangaUpdate
+import tachiyomi.domain.manga.repository.MangaRepository
 
 class SetMangaViewerFlags(
     private val mangaRepository: MangaRepository,

app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt

@@ -1,13 +1,13 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.model.MangaUpdate
 import eu.kanade.domain.manga.model.hasCustomCover
 import eu.kanade.domain.manga.model.isLocal
-import eu.kanade.domain.manga.repository.MangaRepository
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.source.model.SManga
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.MangaUpdate
+import tachiyomi.domain.manga.repository.MangaRepository
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.Date

app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.manga.interactor
 
-import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate
+import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate
-import eu.kanade.domain.manga.repository.MangaMergeRepository
+import tachiyomi.domain.manga.repository.MangaMergeRepository
 
 class UpdateMergedSettings(
     private val mangaMergeRepository: MangaMergeRepository,

app/src/main/java/eu/kanade/domain/manga/model/ComicInfo.kt

@@ -1,11 +1,12 @@
 package eu.kanade.domain.manga.model
 
-import eu.kanade.domain.chapter.model.Chapter
 import eu.kanade.tachiyomi.source.model.SManga
 import kotlinx.serialization.Serializable
 import nl.adaptivity.xmlutil.serialization.XmlElement
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
+import tachiyomi.domain.chapter.model.Chapter
+import tachiyomi.domain.manga.model.Manga
 
 const val COMIC_INFO_FILE = "ComicInfo.xml"
 

app/src/main/java/eu/kanade/domain/manga/model/Manga.kt

@@ -2,273 +2,77 @@ package eu.kanade.domain.manga.model
 
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.tachiyomi.data.cache.CoverCache
-import eu.kanade.tachiyomi.data.library.CustomMangaManager
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
-import eu.kanade.tachiyomi.widget.ExtendedNavigationView
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.model.TriStateFilter
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import java.io.Serializable
 
-data class Manga(
+// TODO: move these into the domain model
-    val id: Long,
+val Manga.readingModeType: Long
-    val source: Long,
+    get() = viewerFlags and ReadingModeType.MASK.toLong()
-    val favorite: Boolean,
-    val lastUpdate: Long,
-    val dateAdded: Long,
-    val viewerFlags: Long,
-    val chapterFlags: Long,
-    val coverLastModified: Long,
-    val url: String,
-    // SY -->
-    val ogTitle: String,
-    val ogArtist: String?,
-    val ogAuthor: String?,
-    val ogDescription: String?,
-    val ogGenre: List<String>?,
-    val ogStatus: Long,
-    // SY <--
-    val thumbnailUrl: String?,
-    val updateStrategy: UpdateStrategy,
-    val initialized: Boolean,
-    // SY -->
-    val filteredScanlators: List<String>?,
-    // SY <--
-) : Serializable {
 
+val Manga.orientationType: Long
+    get() = viewerFlags and OrientationType.MASK.toLong()
+
+val Manga.downloadedFilter: TriStateFilter
+    get() {
+        if (forceDownloaded()) return TriStateFilter.ENABLED_IS
+        return when (downloadedFilterRaw) {
+            Manga.CHAPTER_SHOW_DOWNLOADED -> TriStateFilter.ENABLED_IS
+            Manga.CHAPTER_SHOW_NOT_DOWNLOADED -> TriStateFilter.ENABLED_NOT
+            else -> TriStateFilter.DISABLED
+        }
+    }
+fun Manga.chaptersFiltered(): Boolean {
+    return unreadFilter != TriStateFilter.DISABLED ||
+        downloadedFilter != TriStateFilter.DISABLED ||
+        bookmarkedFilter != TriStateFilter.DISABLED
+}
+fun Manga.forceDownloaded(): Boolean {
+    return favorite && Injekt.get<BasePreferences>().downloadedOnly().get()
+}
+
+fun Manga.toSManga(): SManga = SManga.create().also {
+    it.url = url
+    it.title = title
+    it.artist = artist
+    it.author = author
+    it.description = description
+    it.genre = genre.orEmpty().joinToString()
+    it.status = status.toInt()
+    it.thumbnail_url = thumbnailUrl
+    it.initialized = initialized
+}
+
+fun Manga.copyFrom(other: SManga): Manga {
     // SY -->
-    private val customMangaInfo = if (favorite) {
+    val author = other.author ?: ogAuthor
-        customMangaManager.getManga(this)
+    val artist = other.artist ?: ogArtist
+    val description = other.description ?: ogDescription
+    val genres = if (other.genre != null) {
+        other.getGenres()
     } else {
-        null
+        ogGenre
     }
-
-    val title: String
-        get() = customMangaInfo?.title ?: ogTitle
-
-    val author: String?
-        get() = customMangaInfo?.author ?: ogAuthor
-
-    val artist: String?
-        get() = customMangaInfo?.artist ?: ogArtist
-
-    val description: String?
-        get() = customMangaInfo?.description ?: ogDescription
-
-    val genre: List<String>?
-        get() = customMangaInfo?.genre ?: ogGenre
-
-    val status: Long
-        get() = customMangaInfo?.status ?: ogStatus
     // SY <--
-
+    val thumbnailUrl = other.thumbnail_url ?: thumbnailUrl
-    val sorting: Long
+    return this.copy(
-        get() = chapterFlags and CHAPTER_SORTING_MASK
-
-    val displayMode: Long
-        get() = chapterFlags and CHAPTER_DISPLAY_MASK
-
-    val unreadFilterRaw: Long
-        get() = chapterFlags and CHAPTER_UNREAD_MASK
-
-    val downloadedFilterRaw: Long
-        get() = chapterFlags and CHAPTER_DOWNLOADED_MASK
-
-    val bookmarkedFilterRaw: Long
-        get() = chapterFlags and CHAPTER_BOOKMARKED_MASK
-
-    val readingModeType: Long
-        get() = viewerFlags and ReadingModeType.MASK.toLong()
-
-    val orientationType: Long
-        get() = viewerFlags and OrientationType.MASK.toLong()
-
-    val unreadFilter: TriStateFilter
-        get() = when (unreadFilterRaw) {
-            CHAPTER_SHOW_UNREAD -> TriStateFilter.ENABLED_IS
-            CHAPTER_SHOW_READ -> TriStateFilter.ENABLED_NOT
-            else -> TriStateFilter.DISABLED
-        }
-
-    val downloadedFilter: TriStateFilter
-        get() {
-            if (forceDownloaded()) return TriStateFilter.ENABLED_IS
-            return when (downloadedFilterRaw) {
-                CHAPTER_SHOW_DOWNLOADED -> TriStateFilter.ENABLED_IS
-                CHAPTER_SHOW_NOT_DOWNLOADED -> TriStateFilter.ENABLED_NOT
-                else -> TriStateFilter.DISABLED
-            }
-        }
-
-    val bookmarkedFilter: TriStateFilter
-        get() = when (bookmarkedFilterRaw) {
-            CHAPTER_SHOW_BOOKMARKED -> TriStateFilter.ENABLED_IS
-            CHAPTER_SHOW_NOT_BOOKMARKED -> TriStateFilter.ENABLED_NOT
-            else -> TriStateFilter.DISABLED
-        }
-
-    fun chaptersFiltered(): Boolean {
-        return unreadFilter != TriStateFilter.DISABLED ||
-            downloadedFilter != TriStateFilter.DISABLED ||
-            bookmarkedFilter != TriStateFilter.DISABLED
-    }
-
-    fun forceDownloaded(): Boolean {
-        return favorite && Injekt.get<BasePreferences>().downloadedOnly().get()
-    }
-
-    fun sortDescending(): Boolean {
-        return chapterFlags and CHAPTER_SORT_DIR_MASK == CHAPTER_SORT_DESC
-    }
-
-    fun toSManga(): SManga = SManga.create().also {
-        it.url = url
         // SY -->
-        it.title = ogTitle
+        ogAuthor = author,
-        it.artist = ogArtist
+        ogArtist = artist,
-        it.author = ogAuthor
+        ogDescription = description,
-        it.description = ogDescription
+        ogGenre = genres,
-        it.genre = ogGenre.orEmpty().joinToString()
-        it.status = ogStatus.toInt()
-        // SY <--
-        it.thumbnail_url = thumbnailUrl
-        it.initialized = initialized
-    }
-
-    fun copyFrom(other: SManga): Manga {
-        // SY -->
-        val author = other.author ?: ogAuthor
-        val artist = other.artist ?: ogArtist
-        val description = other.description ?: ogDescription
-        val genres = if (other.genre != null) {
-            other.getGenres()
-        } else {
-            ogGenre
-        }
-        // SY <--
-        val thumbnailUrl = other.thumbnail_url ?: thumbnailUrl
-        return this.copy(
-            // SY -->
-            ogAuthor = author,
-            ogArtist = artist,
-            ogDescription = description,
-            ogGenre = genres,
-            // SY <--
-            thumbnailUrl = thumbnailUrl,
-            // SY -->
-            ogStatus = other.status.toLong(),
-            // SY <--
-            updateStrategy = other.update_strategy,
-            initialized = other.initialized && initialized,
-        )
-    }
-
-    companion object {
-        // Generic filter that does not filter anything
-        const val SHOW_ALL = 0x00000000L
-
-        const val CHAPTER_SORT_DESC = 0x00000000L
-        const val CHAPTER_SORT_ASC = 0x00000001L
-        const val CHAPTER_SORT_DIR_MASK = 0x00000001L
-
-        const val CHAPTER_SHOW_UNREAD = 0x00000002L
-        const val CHAPTER_SHOW_READ = 0x00000004L
-        const val CHAPTER_UNREAD_MASK = 0x00000006L
-
-        const val CHAPTER_SHOW_DOWNLOADED = 0x00000008L
-        const val CHAPTER_SHOW_NOT_DOWNLOADED = 0x00000010L
-        const val CHAPTER_DOWNLOADED_MASK = 0x00000018L
-
-        const val CHAPTER_SHOW_BOOKMARKED = 0x00000020L
-        const val CHAPTER_SHOW_NOT_BOOKMARKED = 0x00000040L
-        const val CHAPTER_BOOKMARKED_MASK = 0x00000060L
-
-        const val CHAPTER_SORTING_SOURCE = 0x00000000L
-        const val CHAPTER_SORTING_NUMBER = 0x00000100L
-        const val CHAPTER_SORTING_UPLOAD_DATE = 0x00000200L
-        const val CHAPTER_SORTING_MASK = 0x00000300L
-
-        const val CHAPTER_DISPLAY_NAME = 0x00000000L
-        const val CHAPTER_DISPLAY_NUMBER = 0x00100000L
-        const val CHAPTER_DISPLAY_MASK = 0x00100000L
-
-        fun create() = Manga(
-            id = -1L,
-            url = "",
-            // Sy -->
-            ogTitle = "",
-            // SY <--
-            source = -1L,
-            favorite = false,
-            lastUpdate = 0L,
-            dateAdded = 0L,
-            viewerFlags = 0L,
-            chapterFlags = 0L,
-            coverLastModified = 0L,
-            // SY -->
-            ogArtist = null,
-            ogAuthor = null,
-            ogDescription = null,
-            ogGenre = null,
-            ogStatus = 0L,
-            // SY <--
-            thumbnailUrl = null,
-            updateStrategy = UpdateStrategy.ALWAYS_UPDATE,
-            initialized = false,
-            // SY -->
-            filteredScanlators = null,
-            // SY <--
-        )
-
-        // SY -->
-        private val customMangaManager: CustomMangaManager by injectLazy()
-        // SY <--
-    }
-}
-
-enum class TriStateFilter {
-    DISABLED, // Disable filter
-    ENABLED_IS, // Enabled with "is" filter
-    ENABLED_NOT, // Enabled with "not" filter
-}
-
-fun TriStateFilter.toTriStateGroupState(): ExtendedNavigationView.Item.TriStateGroup.State {
-    return when (this) {
-        TriStateFilter.DISABLED -> ExtendedNavigationView.Item.TriStateGroup.State.IGNORE
-        TriStateFilter.ENABLED_IS -> ExtendedNavigationView.Item.TriStateGroup.State.INCLUDE
-        TriStateFilter.ENABLED_NOT -> ExtendedNavigationView.Item.TriStateGroup.State.EXCLUDE
-    }
-}
-
-fun Manga.toMangaUpdate(): MangaUpdate {
-    return MangaUpdate(
-        id = id,
-        source = source,
-        favorite = favorite,
-        lastUpdate = lastUpdate,
-        dateAdded = dateAdded,
-        viewerFlags = viewerFlags,
-        chapterFlags = chapterFlags,
-        coverLastModified = coverLastModified,
-        url = url,
-        // SY -->
-        title = ogTitle,
-        artist = ogArtist,
-        author = ogAuthor,
-        description = ogDescription,
-        genre = ogGenre,
-        status = ogStatus,
         // SY <--
         thumbnailUrl = thumbnailUrl,
-        updateStrategy = updateStrategy,
-        initialized = initialized,
         // SY -->
-        filteredScanlators = filteredScanlators,
+        ogStatus = other.status.toLong(),
         // SY <--
+        updateStrategy = other.update_strategy,
+        initialized = other.initialized && initialized,
     )
 }
 

app/src/main/java/eu/kanade/domain/manga/model/MangaUpdate.kt

@@ -1,27 +0,0 @@
-package eu.kanade.domain.manga.model
-
-import eu.kanade.tachiyomi.source.model.UpdateStrategy
-
-data class MangaUpdate(
-    val id: Long,
-    val source: Long? = null,
-    val favorite: Boolean? = null,
-    val lastUpdate: Long? = null,
-    val dateAdded: Long? = null,
-    val viewerFlags: Long? = null,
-    val chapterFlags: Long? = null,
-    val coverLastModified: Long? = null,
-    val url: String? = null,
-    val title: String? = null,
-    val artist: String? = null,
-    val author: String? = null,
-    val description: String? = null,
-    val genre: List<String>? = null,
-    val status: Long? = null,
-    val thumbnailUrl: String? = null,
-    val updateStrategy: UpdateStrategy? = null,
-    val initialized: Boolean? = null,
-    // SY -->
-    val filteredScanlators: List<String>? = null,
-    // SY <--
-)

app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 
 class CountFeedSavedSearchBySourceId(
     private val feedSavedSearchRepository: FeedSavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 
 class CountFeedSavedSearchGlobal(
     private val feedSavedSearchRepository: FeedSavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/CreateSourceCategory.kt

@@ -6,11 +6,6 @@ import eu.kanade.tachiyomi.util.preference.plusAssign
 class CreateSourceCategory(private val preferences: SourcePreferences) {
 
     fun await(category: String): Result {
-        // Do not allow duplicate categories.
-        if (categoryExists(category)) {
-            return Result.CategoryExists
-        }
-
         if (category.contains("|")) {
             return Result.InvalidName
         }
@@ -22,15 +17,7 @@ class CreateSourceCategory(private val preferences: SourcePreferences) {
     }
 
     sealed class Result {
-        object CategoryExists : Result()
         object InvalidName : Result()
         object Success : Result()
     }
-
-    /**
-     * Returns true if a repo with the given name already exists.
-     */
-    private fun categoryExists(name: String): Boolean {
-        return preferences.sourcesTabCategories().get().any { it.equals(name, true) }
-    }
 }

app/src/main/java/eu/kanade/domain/source/interactor/CreateSourceRepo.kt

@@ -6,11 +6,6 @@ import eu.kanade.tachiyomi.util.preference.plusAssign
 class CreateSourceRepo(private val preferences: UnsortedPreferences) {
 
     fun await(name: String): Result {
-        // Do not allow duplicate repos.
-        if (repoExists(name)) {
-            return Result.RepoExists
-        }
-
         // Do not allow invalid formats
         if (!name.matches(repoRegex)) {
             return Result.InvalidName
@@ -22,7 +17,6 @@ class CreateSourceRepo(private val preferences: UnsortedPreferences) {
     }
 
     sealed class Result {
-        object RepoExists : Result()
         object InvalidName : Result()
         object Success : Result()
     }

app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 
 class DeleteFeedSavedSearchById(
     private val feedSavedSearchRepository: FeedSavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt

@@ -1,6 +1,6 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.SavedSearchRepository
+import tachiyomi.domain.source.repository.SavedSearchRepository
 
 class DeleteSavedSearchById(
     private val savedSearchRepository: SavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/DeleteSourceCategory.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.source.interactor
 
 import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.core.preference.getAndSet
 import eu.kanade.tachiyomi.util.preference.minusAssign
+import tachiyomi.core.preference.getAndSet
 
 class DeleteSourceCategory(private val preferences: SourcePreferences) {
 

app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt

@@ -1,8 +1,5 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.model.Pin
-import eu.kanade.domain.source.model.Pins
-import eu.kanade.domain.source.model.Source
 import eu.kanade.domain.source.repository.SourceRepository
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.tachiyomi.source.LocalSource
@@ -10,6 +7,9 @@ import exh.source.BlacklistedSources
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
+import tachiyomi.domain.source.model.Pin
+import tachiyomi.domain.source.model.Pins
+import tachiyomi.domain.source.model.Source
 
 class GetEnabledSources(
     private val repository: SourceRepository,

app/src/main/java/eu/kanade/domain/source/interactor/GetExhSavedSearch.kt

@@ -1,10 +1,7 @@
 package eu.kanade.domain.source.interactor
 
 import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.util.lang.withIOContext
 import exh.log.xLogE
-import exh.savedsearches.EXHSavedSearch
-import exh.savedsearches.models.SavedSearch
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
@@ -12,6 +9,9 @@ import kotlinx.coroutines.flow.map
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
+import tachiyomi.core.util.lang.withIOContext
+import tachiyomi.domain.source.model.EXHSavedSearch
+import tachiyomi.domain.source.model.SavedSearch
 import xyz.nulldev.ts.api.http.serializer.FilterSerializer
 
 class GetExhSavedSearch(

app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
-import exh.savedsearches.models.FeedSavedSearch
 import kotlinx.coroutines.flow.Flow
+import tachiyomi.domain.source.model.FeedSavedSearch
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 
 class GetFeedSavedSearchBySourceId(
     private val feedSavedSearchRepository: FeedSavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
-import exh.savedsearches.models.FeedSavedSearch
 import kotlinx.coroutines.flow.Flow
+import tachiyomi.domain.source.model.FeedSavedSearch
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 
 class GetFeedSavedSearchGlobal(
     private val feedSavedSearchRepository: FeedSavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/GetLanguagesWithSources.kt

@@ -1,12 +1,12 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.model.Source
 import eu.kanade.domain.source.repository.SourceRepository
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import exh.source.BlacklistedSources
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import tachiyomi.domain.source.model.Source
 
 class GetLanguagesWithSources(
     private val repository: SourceRepository,

app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.SavedSearchRepository
+import tachiyomi.domain.source.model.SavedSearch
-import exh.savedsearches.models.SavedSearch
+import tachiyomi.domain.source.repository.SavedSearchRepository
 
 class GetSavedSearchById(
     private val savedSearchRepository: SavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.SavedSearchRepository
-import exh.savedsearches.models.SavedSearch
 import kotlinx.coroutines.flow.Flow
+import tachiyomi.domain.source.model.SavedSearch
+import tachiyomi.domain.source.repository.SavedSearchRepository
 
 class GetSavedSearchBySourceId(
     private val savedSearchRepository: SavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
+import tachiyomi.domain.source.model.SavedSearch
-import exh.savedsearches.models.SavedSearch
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 
 class GetSavedSearchBySourceIdFeed(
     private val feedSavedSearchRepository: FeedSavedSearchRepository,

app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.source.interactor
 
-import eu.kanade.domain.source.repository.FeedSavedSearchRepository
+import tachiyomi.domain.source.model.SavedSearch
-import exh.savedsearches.models.SavedSearch
+import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 
 class GetSavedSearchGlobalFeed(
     private val feedSavedSearchRepository: FeedSavedSearchRepository,