Add option to backup non-library read entries (mihonapp/mihon#1324)

Co-authored-by: jobobby04 <jobobby04@gmail.com> Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com> (cherry picked from commit de36357da834bff4110dbb56dd7ce7aad04d3c7d) (cherry picked from commit 943555c0af49b48abaa18a47395e5516f3357bae)
2024-10-15 05:30:23 +13:00 · 2024-10-15 05:30:23 +13:00 · f839334c1c
commit f839334c1c
parent 221508bc46
9 changed files with 44 additions and 36 deletions
--- a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt
+++ b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt
@ -43,7 +43,7 @@ import tachiyomi.domain.manga.interactor.GetMergedManga
 import tachiyomi.domain.manga.interactor.GetMergedMangaById
 import tachiyomi.domain.manga.interactor.GetMergedMangaForDownloading
 import tachiyomi.domain.manga.interactor.GetMergedReferencesById
-import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibrary
+import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibraryView
 import tachiyomi.domain.manga.interactor.GetSearchMetadata
 import tachiyomi.domain.manga.interactor.GetSearchTags
 import tachiyomi.domain.manga.interactor.GetSearchTitles
@ -104,7 +104,7 @@ class SYDomainModule : InjektModule {
        addFactory { GetPagePreviews(get(), get()) }
        addFactory { SearchEngine() }
        addFactory { IsTrackUnfollowed() }
-        addFactory { GetReadMangaNotInLibrary(get()) }
+        addFactory { GetReadMangaNotInLibraryView(get()) }

        // Required for [MetadataSource]
        addFactory<MetadataSource.GetMangaId> { GetManga(get()) }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
@ -28,12 +28,11 @@ import okio.gzip
 import okio.sink
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.core.common.util.system.logcat
-import tachiyomi.data.DatabaseHandler
-import tachiyomi.data.manga.MangaMapper
 import tachiyomi.domain.backup.service.BackupPreferences
 import tachiyomi.domain.manga.interactor.GetFavorites
 import tachiyomi.domain.manga.interactor.GetMergedManga
 import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.manga.repository.MangaRepository
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@ -50,6 +49,7 @@ class BackupCreator(
    private val parser: ProtoBuf = Injekt.get(),
    private val getFavorites: GetFavorites = Injekt.get(),
    private val backupPreferences: BackupPreferences = Injekt.get(),
+    private val mangaRepository: MangaRepository = Injekt.get(),

    private val categoriesBackupCreator: CategoriesBackupCreator = CategoriesBackupCreator(),
    private val mangaBackupCreator: MangaBackupCreator = MangaBackupCreator(),
@ -62,7 +62,6 @@ class BackupCreator(
    // SY -->
    private val savedSearchBackupCreator: SavedSearchBackupCreator = SavedSearchBackupCreator(),
    private val getMergedManga: GetMergedManga = Injekt.get(),
-    private val handler: DatabaseHandler = Injekt.get(),
    // SY <--
 ) {

@ -90,13 +89,13 @@ class BackupCreator(
                throw IllegalStateException(context.stringResource(MR.strings.create_backup_file_error))
            }

-            val databaseManga = getFavorites.await() /* SY --> */ +
-                if (options.readEntries) {
-                    handler.awaitList { mangasQueries.getReadMangaNotInLibrary(MangaMapper::mapManga) }
-                } else {
-                    emptyList()
-                } + getMergedManga.await() // SY <--
-            val backupManga = backupMangas(databaseManga, options)
+            val nonFavoriteManga = if (options.readEntries) mangaRepository.getReadMangaNotInLibrary() else emptyList()
+            // SY -->
+            val mergedManga = getMergedManga.await()
+            // SY <--
+            val backupManga =
+                backupMangas(getFavorites.await() + nonFavoriteManga /* SY --> */ + mergedManga /* SY <-- */, options)
+
            val backup = Backup(
                backupManga = backupManga,
                backupCategories = backupCategories(options),
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt
@ -12,13 +12,13 @@ data class BackupOptions(
    val chapters: Boolean = true,
    val tracking: Boolean = true,
    val history: Boolean = true,
+    val readEntries: Boolean = true,
    val appSettings: Boolean = true,
    val extensionRepoSettings: Boolean = true,
    val sourceSettings: Boolean = true,
    val privateSettings: Boolean = false,
    // SY -->
    val customInfo: Boolean = true,
-    val readEntries: Boolean = true,
    val savedSearchesFeeds: Boolean = true,
    // SY <--
 ) {
@ -29,13 +29,13 @@ data class BackupOptions(
        chapters,
        tracking,
        history,
+        readEntries,
        appSettings,
        extensionRepoSettings,
        sourceSettings,
        privateSettings,
        // SY -->
        customInfo,
-        readEntries,
        savedSearchesFeeds,
        // SY <--
    )
@ -73,6 +73,12 @@ data class BackupOptions(
                getter = BackupOptions::categories,
                setter = { options, enabled -> options.copy(categories = enabled) },
            ),
+            Entry(
+                label = MR.strings.non_library_settings,
+                getter = BackupOptions::readEntries,
+                setter = { options, enabled -> options.copy(readEntries = enabled) },
+                enabled = { it.libraryEntries },
+            ),
            // SY -->
            Entry(
                label = SYMR.strings.custom_entry_info,
@ -80,12 +86,6 @@ data class BackupOptions(
                setter = { options, enabled -> options.copy(customInfo = enabled) },
                enabled = { it.libraryEntries },
            ),
-            Entry(
-                label = SYMR.strings.all_read_entries,
-                getter = BackupOptions::readEntries,
-                setter = { options, enabled -> options.copy(readEntries = enabled) },
-                enabled = { it.libraryEntries },
-            ),
            Entry(
                // KMK-->
                label = KMR.strings.saved_searches_feeds,
@ -126,13 +126,13 @@ data class BackupOptions(
            chapters = array[2],
            tracking = array[3],
            history = array[4],
-            appSettings = array[5],
-            extensionRepoSettings = array[6],
-            sourceSettings = array[7],
-            privateSettings = array[8],
+            readEntries = array[5],
+            appSettings = array[6],
+            extensionRepoSettings = array[7],
+            sourceSettings = array[8],
+            privateSettings = array[9],
            // SY -->
-            customInfo = array[9],
-            readEntries = array[10],
+            customInfo = array[10],
            savedSearchesFeeds = array[11],
            // SY <--
        )
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt
@ -24,7 +24,7 @@ import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_HAS_U
 import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_COMPLETED
 import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_READ
 import tachiyomi.domain.manga.interactor.GetLibraryManga
-import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibrary
+import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibraryView
 import tachiyomi.domain.track.interactor.GetTracks
 import tachiyomi.domain.track.model.Track
 import tachiyomi.source.local.isLocal
@ -39,7 +39,7 @@ class StatsScreenModel(
    private val preferences: LibraryPreferences = Injekt.get(),
    private val trackerManager: TrackerManager = Injekt.get(),
    // SY -->
-    private val getReadMangaNotInLibrary: GetReadMangaNotInLibrary = Injekt.get(),
+    private val getReadMangaNotInLibraryView: GetReadMangaNotInLibraryView = Injekt.get(),
    // SY <--
 ) : StateScreenModel<StatsScreenState>(StatsScreenState.Loading) {

@ -55,7 +55,7 @@ class StatsScreenModel(
        _allRead.onEach { allRead ->
            mutableState.update { StatsScreenState.Loading }
            val libraryManga = getLibraryManga.await() + if (allRead) {
-                getReadMangaNotInLibrary.await()
+                getReadMangaNotInLibraryView.await()
            } else {
                emptyList()
            }
--- a/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
+++ b/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
@ -51,6 +51,10 @@ class MangaRepositoryImpl(
        return handler.awaitList { mangasQueries.getFavorites(MangaMapper::mapManga) }
    }

+    override suspend fun getReadMangaNotInLibrary(): List<Manga> {
+        return handler.awaitList { mangasQueries.getReadMangaNotInLibrary(MangaMapper::mapManga) }
+    }
+
    override suspend fun getLibraryManga(): List<LibraryManga> {
        return handler.awaitListExecutable {
            (handler as AndroidDatabaseHandler).getLibraryQuery()
@ -198,7 +202,7 @@ class MangaRepositoryImpl(
        handler.await { mangasQueries.deleteById(mangaId) }
    }

-    override suspend fun getReadMangaNotInLibrary(): List<LibraryManga> {
+    override suspend fun getReadMangaNotInLibraryView(): List<LibraryManga> {
        return handler.awaitListExecutable {
            (handler as AndroidDatabaseHandler).getLibraryQuery("M.favorite = 0 AND C.readCount != 0")
        }.map(MangaMapper::mapLibraryView)
--- a/data/src/main/sqldelight/tachiyomi/data/mangas.sq
+++ b/data/src/main/sqldelight/tachiyomi/data/mangas.sq
@ -80,10 +80,12 @@ FROM mangas
 WHERE favorite = 1;

 getReadMangaNotInLibrary:
-SELECT mangas.*
+SELECT *
 FROM mangas
-WHERE favorite = 0 AND _id IN(
-    SELECT chapters.manga_id FROM chapters WHERE read = 1 OR last_page_read != 0
+WHERE favorite = 0 AND _id IN (
+    SELECT DISTINCT chapters.manga_id 
+    FROM chapters 
+    WHERE read = 1 OR last_page_read != 0
 );

 getAllManga:
--- a/domain/src/main/java/tachiyomi/domain/manga/interactor/GetReadMangaNotInLibraryView.kt
+++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetReadMangaNotInLibraryView.kt
@ -3,11 +3,11 @@ package tachiyomi.domain.manga.interactor
 import tachiyomi.domain.library.model.LibraryManga
 import tachiyomi.domain.manga.repository.MangaRepository

-class GetReadMangaNotInLibrary(
+class GetReadMangaNotInLibraryView(
    private val mangaRepository: MangaRepository,
 ) {

    suspend fun await(): List<LibraryManga> {
-        return mangaRepository.getReadMangaNotInLibrary()
+        return mangaRepository.getReadMangaNotInLibraryView()
    }
 }
--- a/domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt
+++ b/domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt
@ -17,6 +17,8 @@ interface MangaRepository {

    suspend fun getFavorites(): List<Manga>

+    suspend fun getReadMangaNotInLibrary(): List<Manga>
+
    suspend fun getLibraryManga(): List<LibraryManga>

    fun getLibraryMangaAsFlow(): Flow<List<LibraryManga>>
@ -44,6 +46,6 @@ interface MangaRepository {

    suspend fun deleteManga(mangaId: Long)

-    suspend fun getReadMangaNotInLibrary(): List<LibraryManga>
+    suspend fun getReadMangaNotInLibraryView(): List<LibraryManga>
    // SY <--
 }
--- a/i18n/src/commonMain/moko-resources/base/strings.xml
+++ b/i18n/src/commonMain/moko-resources/base/strings.xml
@ -540,6 +540,7 @@
    <string name="source_settings">Source settings</string>
    <string name="extensionRepo_settings">Extension repos</string>
    <string name="private_settings">Include sensitive settings (e.g., tracker login tokens)</string>
+    <string name="non_library_settings">All read entries</string>
    <string name="creating_backup">Creating backup</string>
    <string name="creating_backup_error">Backup failed</string>
    <string name="missing_storage_permission">Storage permissions not granted</string>