Add option to keep read manga in Clear Database

Jays2Kings · Aug 21, 2022 · 5e6d85f · 5e6d85f
1 parent 61d0023
commit 5e6d85f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 6 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
@@ -167,6 +167,31 @@ interface MangaQueries : DbProvider {
         )
         .prepare()
 
+    fun getReadNotInLibraryMangas() = db.get()
+        .listOfObjects(Manga::class.java)
+        .withQuery(
+            RawQuery.builder()
+                .query(getReadMangaNotInLibraryQuery())
+                .build(),
+        )
+        .prepare()
+
+    fun deleteMangasNotInLibraryAndNotReadBySourceIds(sourceIds: List<Long>) = db.delete()
+        .byQuery(
+            DeleteQuery.builder()
+                .table(MangaTable.TABLE)
+                .where(
+                    """
+                    ${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_SOURCE} IN (${Queries.placeholders(sourceIds.size)}) AND ${MangaTable.COL_ID} NOT IN (
+                        SELECT ${ChapterTable.COL_MANGA_ID} FROM ${ChapterTable.TABLE} WHERE ${ChapterTable.COL_READ} = 1 OR ${ChapterTable.COL_LAST_PAGE_READ} != 0
+                    )
+                    """.trimIndent(),
+                )
+                .whereArgs(0, *sourceIds.toTypedArray())
+                .build(),
+        )
+        .prepare()
+
     fun deleteMangas() = db.delete()
         .byQuery(
             DeleteQuery.builder()

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt
@@ -319,3 +319,15 @@ fun getSourceIdsWithNonLibraryMangaQuery() =
     WHERE ${Manga.COL_FAVORITE} = 0
     GROUP BY ${Manga.COL_SOURCE}
     """
+
+/**
+ * Query to get manga that are not in library, but have read chapters
+ */
+fun getReadMangaNotInLibraryQuery() =
+    """
+    SELECT ${Manga.TABLE}.* 
+    FROM ${Manga.TABLE} 
+    WHERE ${Manga.COL_FAVORITE} = 0 AND ${Manga.COL_ID} IN(
+        SELECT ${Chapter.TABLE}.${Chapter.COL_MANGA_ID} FROM ${Chapter.TABLE} WHERE ${Chapter.COL_READ} = 1 OR ${Chapter.COL_LAST_PAGE_READ} != 0
+    )
+"""
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
@@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.ui.base.controller.BaseCoroutineController
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.util.system.materialAlertDialog
 import eu.kanade.tachiyomi.util.system.rootWindowInsetsCompat
+import eu.kanade.tachiyomi.util.system.setCustomTitleAndMessage
 import eu.kanade.tachiyomi.util.view.activityBinding
 import eu.kanade.tachiyomi.util.view.fullAppBarHeight
 import eu.kanade.tachiyomi.util.view.scrollViewWith
@@ -229,23 +230,28 @@ class ClearDatabaseController :
 
     class ClearDatabaseSourcesDialog : DialogController() {
         override fun onCreateDialog(savedViewState: Bundle?): Dialog {
+            val item = arrayOf(activity!!.getString(R.string.clear_db_exclude_read))
+            val selected = booleanArrayOf(true)
             return activity!!.materialAlertDialog()
-                .setMessage(R.string.clear_database_confirmation)
+                .setCustomTitleAndMessage(0, activity!!.getString(R.string.clear_database_confirmation))
+                .setMultiChoiceItems(item, selected) { _, which, checked ->
+                    selected[which] = checked
+                }
                 .setPositiveButton(android.R.string.ok) { _, _ ->
-                    (targetController as? ClearDatabaseController)?.clearDatabaseForSelectedSources()
+                    (targetController as? ClearDatabaseController)?.clearDatabaseForSelectedSources(selected.last())
                 }
                 .setNegativeButton(android.R.string.cancel, null)
                 .create()
         }
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    private fun clearDatabaseForSelectedSources() {
+    private fun clearDatabaseForSelectedSources(keepReadManga: Boolean) {
         val adapter = adapter ?: return
         val selectedSourceIds = adapter.selectedPositions.mapNotNull { position ->
             adapter.getItem(position)?.source?.id
         }
-        presenter.clearDatabaseForSourceIds(selectedSourceIds)
+        presenter.clearDatabaseForSourceIds(selectedSourceIds, keepReadManga)
         binding.fab.isVisible = false
         adapter.clearSelection()
         adapter.notifyDataSetChanged()

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt
@@ -29,8 +29,12 @@ class ClearDatabasePresenter : BaseCoroutinePresenter<ClearDatabaseController>()
         getDatabaseSources()
     }
 
-    fun clearDatabaseForSourceIds(sources: List<Long>) {
-        db.deleteMangasNotInLibraryBySourceIds(sources).executeAsBlocking()
+    fun clearDatabaseForSourceIds(sources: List<Long>, keepReadManga: Boolean) {
+        if (keepReadManga) {
+            db.deleteMangasNotInLibraryAndNotReadBySourceIds(sources).executeAsBlocking()
+        } else {
+            db.deleteMangasNotInLibraryBySourceIds(sources).executeAsBlocking()
+        }
         db.deleteHistoryNoLastRead().executeAsBlocking()
         getDatabaseSources()
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -831,6 +831,7 @@
     <string name="clear_database_source_item_count">%1$d non-library manga in database</string>
     <string name="clear_database_summary">Delete manga and chapters that are not in your library</string>
     <string name="clear_database_confirmation">Are you sure? Read chapters and progress of non-library manga will be lost</string>
+    <string name="clear_db_exclude_read">Keep manga with read chapters</string>
     <string name="clear_database_completed">Entries deleted</string>
     <string name="database_clean">Database clean</string>
     <string name="refresh_library_metadata">Refresh library metadata</string>