gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-06 23:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1515 from Xwite/master

Browse Source 
fix：二级目录书源 正文不能通过书源检测
This commit is contained in:
kunfei 2022-01-11 15:32:20 +08:00 committed by GitHub
commit 4640aa896e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt
View File

@ -194,7 +194,7 @@ object BookChapterList {
if (bookChapter.url.isEmpty()) {
if (bookChapter.isVolume) {
bookChapter.url = bookChapter.title
Debug.log(bookSource.bookSourceUrl, "目录${index}(Volume)未获取到url,使用章节标题替代")
Debug.log(bookSource.bookSourceUrl, "一级目录${index}未获取到url,使用章节标题替代")
} else {
bookChapter.url = baseUrl
Debug.log(bookSource.bookSourceUrl, "目录${index}未获取到url,使用baseUrl替代")

7
app/src/main/java/io/legado/app/model/webBook/WebBook.kt
View File

@ -261,8 +261,11 @@ object WebBook {
Debug.log(bookSource.bookSourceUrl, "⇒正文规则为空,使用章节链接:${bookChapter.url}")
return bookChapter.url
}
//章节名为卷名时 且 章节url没获取到，返回空白
if(bookChapter.isVolume && bookChapter.url == bookChapter.title) return ""
if(bookChapter.isVolume && bookChapter.url == bookChapter.title) {
//不返回空值，是为了过书源检测
Debug.log(bookSource.bookSourceUrl, "⇒一级目录正文,使用章节标题:${bookChapter.title}")
return bookChapter.title
}
return if (bookChapter.url == book.bookUrl && !book.tocHtml.isNullOrEmpty()) {
BookContent.analyzeContent(
scope = scope,

4
app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
View File

@ -332,7 +332,7 @@ object ChapterProvider {
}
lineIndex == layout.lineCount - 1 -> {
//最后一行
textLine.text = "$words\n"
textLine.text = if(isVolumeTitle) "" else "$words\n"
isLastLine = true
//标题居中
val startX = if (isTitle && ReadBookConfig.titleMode == 1 || isVolumeTitle)
@ -349,7 +349,7 @@ object ChapterProvider {
}
else -> {
//中间行
textLine.text = words
textLine.text = if(isVolumeTitle) "" else words
addCharsToLineMiddle(
absStartX,
textLine,