From ac5bd2de89ba17ef2c752f5d196061fa06444944 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 2 Dec 2020 16:52:55 +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 --- .../io/legado/app/data/entities/rule/BookInfoRule.kt | 3 ++- .../main/java/io/legado/app/model/webBook/BookInfo.kt | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt index 2c0a4509e..e04320b94 100644 --- a/app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt @@ -15,5 +15,6 @@ data class BookInfoRule( var updateTime: String? = null, var coverUrl: String? = null, var tocUrl: String? = null, - var wordCount: String? = null + var wordCount: String? = null, + var canReName: Boolean? = null ) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt index 48b57a7b4..1bda2e242 100644 --- a/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt @@ -34,20 +34,21 @@ object BookInfo { analyzeRule.setContent(analyzeRule.getElement(it)) } } + val mCanReName = canReName && infoRule.canReName == true Debug.log(bookSource.bookSourceUrl, "┌获取书名") BookHelp.formatBookName(analyzeRule.getString(infoRule.name)).let { - if (it.isNotEmpty() && (canReName || book.name.isEmpty())) { + if (it.isNotEmpty() && (mCanReName || book.name.isEmpty())) { book.name = it } + Debug.log(bookSource.bookSourceUrl, "└${it}") } - Debug.log(bookSource.bookSourceUrl, "└${book.name}") Debug.log(bookSource.bookSourceUrl, "┌获取作者") BookHelp.formatBookAuthor(analyzeRule.getString(infoRule.author)).let { - if (it.isNotEmpty() && (canReName || book.name.isEmpty())) { + if (it.isNotEmpty() && (mCanReName || book.name.isEmpty())) { book.author = it } + Debug.log(bookSource.bookSourceUrl, "└${it}") } - Debug.log(bookSource.bookSourceUrl, "└${book.author}") Debug.log(bookSource.bookSourceUrl, "┌获取分类") analyzeRule.getStringList(infoRule.kind) ?.joinToString(",")