From 1f9b8d0d8b2a8b253ab92e316ccf72f0f9521c85 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Sat, 7 May 2022 13:53:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=A1=E9=AA=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/service/CheckSourceService.kt  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/io/legado/app/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
index 9e145b62e..a7a81b924 100644
--- a/app/src/main/java/io/legado/app/service/CheckSourceService.kt
+++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
@@ -135,17 +135,19 @@ class CheckSourceService : BaseService() {
                 ?.filterNot {
                     it.startsWith("Error: ")
                 }?.joinToString("\n")
-            //校验搜索书籍 用户设置校验搜索 并且 搜索链接不为空
-            if (CheckSource.checkSearch && !source.searchUrl.isNullOrBlank()) {
-                val searchBooks = WebBook.searchBookAwait(this, source, searchWord)
-                if (searchBooks.isEmpty()) {
-                    source.addGroup("搜索失效")
-                    if (!CheckSource.checkDiscovery) {
-                        throw NoStackTraceException("搜索书籍为空")
+            //校验搜索书籍
+            if (CheckSource.checkSearch) {
+                if (!source.searchUrl.isNullOrBlank()) {
+                    source.removeGroup("搜索链接规则为空")
+                    val searchBooks = WebBook.searchBookAwait(this, source, searchWord)
+                    if (searchBooks.isEmpty()) {
+                        source.addGroup("搜索失效")
+                    } else {
+                        source.removeGroup("搜索失效")
+                        checkBook(searchBooks.first().toBook(), source)
                     }
                 } else {
-                    source.removeGroup("搜索失效")
-                    checkBook(searchBooks.first().toBook(), source)
+                    source.addGroup("搜索链接规则为空")
                 }
             }
             //校验发现书籍
@@ -159,18 +161,12 @@ class CheckSourceService : BaseService() {
                     }
                 }
                 if (url.isNullOrBlank()) {
-                    when {
-                        !CheckSource.checkSearch -> throw NoStackTraceException("没有发现")
-                        source.hasGroup("搜索失效") -> throw NoStackTraceException("搜索内容为空并且没有发现")
-                    }
+                   source.addGroup("发现规则为空")
                 } else {
+                    source.removeGroup("发现规则为空")
                     val exploreBooks = WebBook.exploreBookAwait(this, source, url)
                     if (exploreBooks.isEmpty()) {
                         source.addGroup("发现失效")
-                        when {
-                            !CheckSource.checkSearch -> throw NoStackTraceException("发现书籍为空")
-                            source.hasGroup("搜索失效") -> throw NoStackTraceException("搜索内容和发现书籍为空")
-                        }
                     } else {
                         source.removeGroup("发现失效")
                         checkBook(exploreBooks.first().toBook(), source, false)