From 42e49452d744c2bbdda73c386df09436c6bd36d2 Mon Sep 17 00:00:00 2001 From: gedoor Date: Sat, 27 Feb 2021 10:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=B7=B3=E5=88=B0=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=97=B6=E5=86=99=E5=85=A5=E7=9B=AE=E5=BD=95?= =?UTF-8?q?url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/model/webBook/BookInfo.kt | 16 ++++- .../io/legado/app/model/webBook/BookList.kt | 64 ++++--------------- 2 files changed, 25 insertions(+), 55 deletions(-) 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 aaabf18fa..e4ee6cdbd 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 @@ -29,10 +29,22 @@ object BookInfo { appCtx.getString(R.string.error_get_web_content, baseUrl) ) Debug.log(bookSource.bookSourceUrl, "≡获取成功:${baseUrl}") - val infoRule = bookSource.getBookInfoRule() val analyzeRule = AnalyzeRule(book) analyzeRule.setContent(body).setBaseUrl(baseUrl) analyzeRule.setRedirectUrl(redirectUrl) + analyzeBookInfo(scope, book, analyzeRule, bookSource, baseUrl, redirectUrl, canReName) + } + + fun analyzeBookInfo( + scope: CoroutineScope, + book: Book, + analyzeRule: AnalyzeRule, + bookSource: BookSource, + baseUrl: String, + redirectUrl: String, + canReName: Boolean, + ) { + val infoRule = bookSource.getBookInfoRule() infoRule.init?.let { if (it.isNotBlank()) { scope.ensureActive() @@ -94,7 +106,7 @@ object BookInfo { book.tocUrl = analyzeRule.getString(infoRule.tocUrl, true) if (book.tocUrl.isEmpty()) book.tocUrl = baseUrl if (book.tocUrl == baseUrl) { - book.tocHtml = body + book.tocHtml = analyzeRule.content.toString() } Debug.log(bookSource.bookSourceUrl, "└${book.tocUrl}") } 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 68182a693..3ffe8324a 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 @@ -1,6 +1,7 @@ package io.legado.app.model.webBook import io.legado.app.R +import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.SearchBook import io.legado.app.data.entities.rule.BookListRule @@ -124,59 +125,16 @@ object BookList { baseUrl: String, variable: String? ): SearchBook? { - val searchBook = SearchBook(variable = variable) - searchBook.bookUrl = baseUrl - searchBook.origin = bookSource.bookSourceUrl - searchBook.originName = bookSource.bookSourceName - searchBook.originOrder = bookSource.customOrder - searchBook.type = bookSource.bookSourceType - analyzeRule.book = searchBook - with(bookSource.getBookInfoRule()) { - init?.let { - if (it.isNotEmpty()) { - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "≡执行详情页初始化规则") - analyzeRule.setContent(analyzeRule.getElement(it)) - } - } - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "┌获取书名") - searchBook.name = BookHelp.formatBookName(analyzeRule.getString(name)) - Debug.log(bookSource.bookSourceUrl, "└${searchBook.name}") - if (searchBook.name.isNotEmpty()) { - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "┌获取作者") - searchBook.author = BookHelp.formatBookAuthor(analyzeRule.getString(author)) - Debug.log(bookSource.bookSourceUrl, "└${searchBook.author}") - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "┌获取分类") - searchBook.kind = analyzeRule.getStringList(kind)?.joinToString(",") - Debug.log(bookSource.bookSourceUrl, "└${searchBook.kind}") - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "┌获取字数") - searchBook.wordCount = wordCountFormat(analyzeRule.getString(wordCount)) - Debug.log(bookSource.bookSourceUrl, "└${searchBook.wordCount}") - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "┌获取最新章节") - searchBook.latestChapterTitle = analyzeRule.getString(lastChapter) - Debug.log(bookSource.bookSourceUrl, "└${searchBook.latestChapterTitle}") - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "┌获取简介") - searchBook.intro = analyzeRule.getString(intro).htmlFormat() - Debug.log(bookSource.bookSourceUrl, "└${searchBook.intro}") - scope.ensureActive() - Debug.log(bookSource.bookSourceUrl, "┌获取封面链接") - searchBook.coverUrl = analyzeRule.getString(coverUrl, true) - Debug.log(bookSource.bookSourceUrl, "└${searchBook.coverUrl}") - Debug.log(bookSource.bookSourceUrl, "┌获取目录链接") - searchBook.tocUrl = analyzeRule.getString(tocUrl, true) - if (searchBook.tocUrl.isEmpty()) searchBook.tocUrl = baseUrl - if (searchBook.tocUrl == baseUrl) { - searchBook.tocHtml = analyzeRule.content.toString() - } - Debug.log(bookSource.bookSourceUrl, "└${searchBook.tocUrl}") - return searchBook - } + val book = Book(variable = variable) + book.bookUrl = baseUrl + book.origin = bookSource.bookSourceUrl + book.originName = bookSource.bookSourceName + book.originOrder = bookSource.customOrder + book.type = bookSource.bookSourceType + analyzeRule.book = book + BookInfo.analyzeBookInfo(scope, book, analyzeRule, bookSource, baseUrl, baseUrl, false) + if (book.name.isNotBlank()) { + return book.toSearchBook() } return null }