feat: 优化书源校验,自定义搜索关键字

app/src/main/java/io/legado/app/service/CheckSourceService.kt

@@ -7,13 +7,11 @@ import io.legado.app.R
 import io.legado.app.base.BaseService
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.IntentAction
-import io.legado.app.data.entities.BookSource
 import io.legado.app.help.AppConfig
 import io.legado.app.help.IntentHelp
 import io.legado.app.help.coroutine.CompositeCoroutine
-import io.legado.app.model.WebBook
+import io.legado.app.service.help.CheckSource
 import io.legado.app.ui.book.source.manage.BookSourceActivity
-import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.asCoroutineDispatcher
 import org.jetbrains.anko.toast
 import java.util.concurrent.Executors
@@ -80,24 +78,15 @@ class CheckSourceService : BaseService() {
                     if (source.searchUrl.isNullOrEmpty()) {
                         onNext(sourceUrl)
                     } else {
-                        check(source)
+                        CheckSource(source).check(this, searchPool) {
+                            onNext(it)
+                        }
                     }
                 } ?: onNext(sourceUrl)
             }
         }
     }
 
-    private fun check(source: BookSource) {
-        val webBook = WebBook(source)
-        tasks.add(webBook.searchBook("我的", scope = this, context = searchPool)
-            .onError(IO) {
-                source.addGroup("失效")
-                App.db.bookSourceDao().update(source)
-            }.onFinally(IO) {
-                onNext(source.bookSourceUrl)
-            })
-    }
-
     private fun onNext(sourceUrl: String) {
         synchronized(this) {
             check()

app/src/main/java/io/legado/app/service/help/CheckSource.kt

@@ -2,34 +2,59 @@ package io.legado.app.service.help
 
 import android.content.Context
 import android.content.Intent
+import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.constant.IntentAction
 import io.legado.app.data.entities.BookSource
+import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.model.WebBook
 import io.legado.app.service.CheckSourceService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import org.jetbrains.anko.toast
+import kotlin.coroutines.CoroutineContext
 
-object CheckSource {
+class CheckSource(val source: BookSource) {
 
-    fun start(context: Context, sources: List<BookSource>) {
-        if (sources.isEmpty()) {
-            context.toast(R.string.non_select)
-            return
-        }
-        val selectedIds: ArrayList<String> = arrayListOf()
-        sources.map {
-            selectedIds.add(it.bookSourceUrl)
+    companion object {
+        var keyword = "我的"
+
+        fun start(context: Context, sources: List<BookSource>) {
+            if (sources.isEmpty()) {
+                context.toast(R.string.non_select)
+                return
+            }
+            val selectedIds: ArrayList<String> = arrayListOf()
+            sources.map {
+                selectedIds.add(it.bookSourceUrl)
+            }
+            Intent(context, CheckSourceService::class.java).let {
+                it.action = IntentAction.start
+                it.putExtra("selectIds", selectedIds)
+                context.startService(it)
+            }
         }
-        Intent(context, CheckSourceService::class.java).let {
-            it.action = IntentAction.start
-            it.putExtra("selectIds", selectedIds)
-            context.startService(it)
+
+        fun stop(context: Context) {
+            Intent(context, CheckSourceService::class.java).let {
+                it.action = IntentAction.stop
+                context.startService(it)
+            }
         }
     }
 
-    fun stop(context: Context) {
-        Intent(context, CheckSourceService::class.java).let {
-            it.action = IntentAction.stop
-            context.startService(it)
-        }
+    fun check(
+        scope: CoroutineScope,
+        context: CoroutineContext,
+        onNext: (sourceUrl: String) -> Unit
+    ): Coroutine<*> {
+        val webBook = WebBook(source)
+        return webBook.searchBook(keyword, scope = scope, context = context)
+            .onError(Dispatchers.IO) {
+                source.addGroup("失效")
+                App.db.bookSourceDao().update(source)
+            }.onFinally(Dispatchers.IO) {
+                onNext(source.bookSourceUrl)
+            }
     }
 }

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@@ -231,13 +231,35 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
             R.id.menu_enable_explore -> viewModel.enableSelectExplore(adapter.getSelection())
             R.id.menu_disable_explore -> viewModel.disableSelectExplore(adapter.getSelection())
             R.id.menu_export_selection -> FilePicker.selectFolder(this, exportRequestCode)
-            R.id.menu_check_source -> CheckSource.start(this, adapter.getSelection())
+            R.id.menu_check_source -> checkSource()
             R.id.menu_top_sel -> viewModel.topSource(*adapter.getSelection().toTypedArray())
             R.id.menu_bottom_sel -> viewModel.bottomSource(*adapter.getSelection().toTypedArray())
         }
         return true
     }
 
+    @SuppressLint("InflateParams")
+    private fun checkSource() {
+        alert(titleResource = R.string.search_book_key) {
+            var editText: AutoCompleteTextView? = null
+            customView {
+                layoutInflater.inflate(R.layout.dialog_edit_text, null).apply {
+                    editText = edit_view
+                    edit_view.setText(CheckSource.keyword)
+                }
+            }
+            okButton {
+                editText?.text?.toString()?.let {
+                    if (it.isNotEmpty()) {
+                        CheckSource.keyword = it
+                    }
+                }
+                CheckSource.start(this@BookSourceActivity, adapter.getSelection())
+            }
+            noButton { }
+        }.show().applyTint()
+    }
+
     private fun upGroupMenu() {
         groupMenu?.removeGroup(R.id.source_group)
         groups.sortedWith(Collator.getInstance(java.util.Locale.CHINESE))