From 726f584d88376236d46c71fed23776f0affbfc45 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 5 Aug 2019 09:49:12 +0800
Subject: [PATCH] up

---
 app/src/main/java/io/legado/app/help/BookHelp.kt          | 5 +++++
 app/src/main/java/io/legado/app/model/webbook/BookList.kt | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/BookHelp.kt b/app/src/main/java/io/legado/app/help/BookHelp.kt
index 1e975631f..8d93877bc 100644
--- a/app/src/main/java/io/legado/app/help/BookHelp.kt
+++ b/app/src/main/java/io/legado/app/help/BookHelp.kt
@@ -20,4 +20,9 @@ object BookHelp {
     }
 
 
+    fun formatAuthor(author: String?): String {
+        return author?.replace("作\\s*者[\\s:：]*".toRegex(), "")?.replace("\\s+".toRegex(), " ")?.trim { it <= ' ' }
+            ?: ""
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/model/webbook/BookList.kt b/app/src/main/java/io/legado/app/model/webbook/BookList.kt
index 295bfa3eb..635f8e249 100644
--- a/app/src/main/java/io/legado/app/model/webbook/BookList.kt
+++ b/app/src/main/java/io/legado/app/model/webbook/BookList.kt
@@ -4,6 +4,7 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.data.entities.BookSource
 import io.legado.app.data.entities.SearchBook
+import io.legado.app.help.BookHelp
 import io.legado.app.model.analyzeRule.AnalyzeRule
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.utils.NetworkUtils
@@ -114,7 +115,7 @@ object BookList {
             SourceDebug.printLog(bookSource.bookSourceUrl, 1, searchBook.name ?: "")
             if (!searchBook.name.isNullOrEmpty()) {
                 SourceDebug.printLog(bookSource.bookSourceUrl, 1, "获取作者")
-                searchBook.author = analyzeRule.getString(author ?: "")
+                searchBook.author = BookHelp.formatAuthor(analyzeRule.getString(author ?: ""))
                 SourceDebug.printLog(bookSource.bookSourceUrl, 1, searchBook.author ?: "")
                 SourceDebug.printLog(bookSource.bookSourceUrl, 1, "获取分类")
                 searchBook.kind = analyzeRule.getString(kind ?: "")
@@ -167,7 +168,7 @@ object BookList {
             searchBook.bookUrl = analyzeRule.getString(ruleBookUrl, true)
             SourceDebug.printLog(bookSource.bookSourceUrl, 1, searchBook.bookUrl, printLog)
             SourceDebug.printLog(bookSource.bookSourceUrl, 1, "获取作者", printLog)
-            searchBook.author = analyzeRule.getString(ruleAuthor)
+            searchBook.author = BookHelp.formatAuthor(analyzeRule.getString(ruleAuthor))
             SourceDebug.printLog(bookSource.bookSourceUrl, 1, searchBook.author ?: "", printLog)
             SourceDebug.printLog(bookSource.bookSourceUrl, 1, "获取分类", printLog)
             searchBook.kind = analyzeRule.getString(ruleKind)