Use a single I/O thread when deleting multiple notebooks

This resolves issue #315.
orgzly-revived · Sep 1, 2024 · 9d3c37b · 9d3c37b
1 parent 26e8126
commit 9d3c37b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/app/src/main/java/com/orgzly/android/ui/books/BooksFragment.kt b/app/src/main/java/com/orgzly/android/ui/books/BooksFragment.kt
@@ -336,9 +336,8 @@ class BooksFragment : CommonFragment(), DrawerItem, OnViewHolderClickListener<Bo
             when (which) {
                 DialogInterface.BUTTON_POSITIVE -> {
                     val deleteLinked = dialogBinding.deleteLinkedCheckbox.isChecked
-                    for (book in books) {
-                        viewModel.deleteBook(book.book.id, deleteLinked)
-                    }
+                    val bookIds = books.map { it.book.id }.toSet()
+                    viewModel.deleteBooks(bookIds, deleteLinked)
                 }
             }
         }

diff --git a/app/src/main/java/com/orgzly/android/ui/books/BooksViewModel.kt b/app/src/main/java/com/orgzly/android/ui/books/BooksViewModel.kt
@@ -13,7 +13,16 @@ import com.orgzly.android.db.entity.Repo
 import com.orgzly.android.ui.AppBar
 import com.orgzly.android.ui.CommonViewModel
 import com.orgzly.android.ui.SingleLiveEvent
-import com.orgzly.android.usecase.*
+import com.orgzly.android.usecase.BookCreate
+import com.orgzly.android.usecase.BookDelete
+import com.orgzly.android.usecase.BookExportToUri
+import com.orgzly.android.usecase.BookForceLoad
+import com.orgzly.android.usecase.BookForceSave
+import com.orgzly.android.usecase.BookImportFromUri
+import com.orgzly.android.usecase.BookLinkUpdate
+import com.orgzly.android.usecase.BookRename
+import com.orgzly.android.usecase.UseCaseResult
+import com.orgzly.android.usecase.UseCaseRunner
 import com.orgzly.android.util.LogUtils
 
 
@@ -70,10 +79,10 @@ class BooksViewModel(private val dataRepository: DataRepository) : CommonViewMod
         }
     }
 
-    fun deleteBook(bookId: Long, deleteLinked: Boolean) {
+    fun deleteBooks(bookIds: Set<Long>, deleteLinked: Boolean) {
         App.EXECUTORS.diskIO().execute {
             catchAndPostError {
-                val result = UseCaseRunner.run(BookDelete(bookId, deleteLinked))
+                val result = UseCaseRunner.run(BookDelete(bookIds, deleteLinked))
                 bookDeletedEvent.postValue(result)
             }
         }

diff --git a/app/src/main/java/com/orgzly/android/usecase/BookDelete.kt b/app/src/main/java/com/orgzly/android/usecase/BookDelete.kt
@@ -2,12 +2,12 @@ package com.orgzly.android.usecase
 
 import com.orgzly.android.data.DataRepository
 
-class BookDelete(val bookId: Long, val deleteLinked: Boolean) : UseCase() {
+class BookDelete(val bookIds: Set<Long>, val deleteLinked: Boolean) : UseCase() {
     override fun run(dataRepository: DataRepository): UseCaseResult {
-        val book = dataRepository.getBookView(bookId) ?: throw NotFound()
-
-        dataRepository.deleteBook(book, deleteLinked)
-
+        for (bookId in bookIds) {
+            val book = dataRepository.getBookView(bookId) ?: throw NotFound()
+            dataRepository.deleteBook(book, deleteLinked)
+        }
         return UseCaseResult(
                 modifiesLocalData = true,
                 triggersSync = SYNC_DATA_MODIFIED