From 6965b6ad4468f034d6d1fa72efd03630aca225c6 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Thu, 30 Sep 2021 16:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/legado/app/data/entities/BookSource.kt   | 2 +-
 .../app/ui/book/source/debug/BookSourceDebugActivity.kt   | 8 +++++++-
 .../java/io/legado/app/ui/main/explore/ExploreAdapter.kt  | 7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/BookSource.kt b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
index 665a79ceb..8011f44c9 100644
--- a/app/src/main/java/io/legado/app/data/entities/BookSource.kt
+++ b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
@@ -92,7 +92,7 @@ data class BookSource(
                     }
                 }
             }.onFailure {
-                kinds.add(ExploreKind(it.localizedMessage ?: ""))
+                kinds.add(ExploreKind("ERROR:${it.localizedMessage}", it.stackTraceToString()))
                 AppLog.put("解析发现规则出错\n${it.localizedMessage}", it)
                 it.printOnDebug()
             }
diff --git a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt
index 998bb81c8..59c40e692 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt
@@ -90,6 +90,10 @@ class BookSourceDebugActivity : VMBaseActivity<ActivitySourceDebugBinding, BookS
             !it.url.isNullOrBlank()
         }?.let {
             binding.textFx.text = "${it.title}::${it.url}"
+            if (it.title.startsWith("ERROR:")) {
+                adapter.addItem("获取发现出错\n${it.url}")
+                openOrCloseHelp(false)
+            }
         }
         binding.textMy.onClick {
             searchView.setQuery(binding.textMy.text, true)
@@ -98,7 +102,9 @@ class BookSourceDebugActivity : VMBaseActivity<ActivitySourceDebugBinding, BookS
             searchView.setQuery(binding.textXt.text, true)
         }
         binding.textFx.onClick {
-            searchView.setQuery(binding.textFx.text, true)
+            if (!binding.textFx.text.startsWith("ERROR:")) {
+                searchView.setQuery(binding.textFx.text, true)
+            }
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
index baa991268..f5876a195 100644
--- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
@@ -18,6 +18,7 @@ import io.legado.app.databinding.ItemFindBookBinding
 import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.ui.login.SourceLoginActivity
+import io.legado.app.ui.widget.dialog.TextDialog
 import io.legado.app.utils.*
 import kotlinx.coroutines.CoroutineScope
 import splitties.views.onLongClick
@@ -95,7 +96,11 @@ class ExploreAdapter(context: Context, private val scope: CoroutineScope, val ca
                     tv.setOnClickListener(null)
                 } else {
                     tv.setOnClickListener {
-                        callBack.openExplore(sourceUrl, kind.title, kind.url)
+                        if (kind.title.startsWith("ERROR:")) {
+                            it.activity?.showDialogFragment(TextDialog(kind.url))
+                        } else {
+                            callBack.openExplore(sourceUrl, kind.title, kind.url)
+                        }
                     }
                 }
             }