From 94a81eae14ac3c65263043937855ec4e809724c3 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sun, 3 Apr 2022 23:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E6=8D=A2?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/ui/book/arrange/ArrangeBookActivity.kt  |  2 +-
 .../legado/app/ui/book/arrange/ArrangeBookViewModel.kt | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
index d151c84e1..85c67d54c 100644
--- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
@@ -117,7 +117,7 @@ class ArrangeBookActivity : VMBaseActivity<ActivityArrangeBookBinding, ArrangeBo
                     size = viewModel.batchChangeSourceSize,
                     position = viewModel.batchChangeSourcePosition
                 ) {
-
+                    viewModel.batchChangeSourceCoroutine?.cancel()
                 }
             }
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt
index bab8319d8..d518528c2 100644
--- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt
@@ -15,6 +15,7 @@ class ArrangeBookViewModel(application: Application) : BaseViewModel(application
     val batchChangeSourceState = mutableStateOf(false)
     val batchChangeSourceSize = mutableStateOf(0)
     val batchChangeSourcePosition = mutableStateOf(0)
+    var batchChangeSourceCoroutine: Coroutine<Unit>? = null
 
     fun upCanUpdate(books: Array<Book>, canUpdate: Boolean) {
         execute {
@@ -37,17 +38,16 @@ class ArrangeBookViewModel(application: Application) : BaseViewModel(application
         }
     }
 
-    fun changeSource(books: Array<Book>, source: BookSource): Coroutine<Unit> {
-        return execute {
+    fun changeSource(books: Array<Book>, source: BookSource) {
+        batchChangeSourceCoroutine?.cancel()
+        batchChangeSourceCoroutine = execute {
             batchChangeSourceSize.value = books.size
             books.forEachIndexed { index, book ->
                 batchChangeSourcePosition.value = index + 1
                 WebBook.preciseSearchAwait(this, book.name, book.author, source)?.let {
-
+                    book.changeTo(it.second)
                 }
             }
-        }.onCancel {
-            batchChangeSourceState.value = false
         }.onFinally {
             batchChangeSourceState.value = false
         }