k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

up

Browse Source
pull/38/head
kunfei 5 years ago
parent 66f17ba898
commit ca910982eb
3 changed files with 32 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt
  2. 47
      app/src/main/java/io/legado/app/model/webbook/BookList.kt
  3. 18
      app/src/main/java/io/legado/app/model/webbook/SourceDebug.kt

12
app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt
Unescape View File

@ -133,7 +133,7 @@ object BookChapterList {
val analyzeRule = AnalyzeRule(book) val analyzeRule = AnalyzeRule(book)
analyzeRule.setContent(body, baseUrl) analyzeRule.setContent(body, baseUrl)
if (getNextUrl) { if (getNextUrl) {
SourceDebug.printLog(bookSource.bookSourceUrl, "获取目录下一页列表", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取目录下一页列表", printLog)
analyzeRule.getStringList(tocRule.nextTocUrl ?: "", true)?.let { analyzeRule.getStringList(tocRule.nextTocUrl ?: "", true)?.let {
for (item in it) { for (item in it) {
if (item != baseUrl) { if (item != baseUrl) {
@ -144,14 +144,14 @@ object BookChapterList {
SourceDebug.printLog( SourceDebug.printLog(
bookSource.bookSourceUrl, bookSource.bookSourceUrl,
TextUtils.join(",", nextUrlList), TextUtils.join(",", nextUrlList),
print = printLog printLog
) )
} }
SourceDebug.printLog(bookSource.bookSourceUrl, "解析目录列表", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "解析目录列表", printLog)
val elements = analyzeRule.getElements(listRule) val elements = analyzeRule.getElements(listRule)
SourceDebug.printLog(bookSource.bookSourceUrl, "目录数${elements.size}", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "目录数${elements.size}", printLog)
if (elements.isNotEmpty()) { if (elements.isNotEmpty()) {
SourceDebug.printLog(bookSource.bookSourceUrl, "获取目录", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取目录", printLog)
val nameRule = analyzeRule.splitSourceRule(tocRule.chapterName ?: "") val nameRule = analyzeRule.splitSourceRule(tocRule.chapterName ?: "")
val urlRule = analyzeRule.splitSourceRule(tocRule.chapterUrl ?: "") val urlRule = analyzeRule.splitSourceRule(tocRule.chapterUrl ?: "")
for (item in elements) { for (item in elements) {
@ -168,7 +168,7 @@ object BookChapterList {
SourceDebug.printLog( SourceDebug.printLog(
bookSource.bookSourceUrl, bookSource.bookSourceUrl,
"${chapterList[0].title}${chapterList[0].url}", "${chapterList[0].title}${chapterList[0].url}",
print = printLog printLog
) )
} }
return ChapterData(chapterList, nextUrlList) return ChapterData(chapterList, nextUrlList)

47
app/src/main/java/io/legado/app/model/webbook/BookList.kt
Unescape View File

@ -133,11 +133,7 @@ object BookList {
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.kind) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.kind)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取简介") SourceDebug.printLog(bookSource.bookSourceUrl, "获取简介")
searchBook.intro = analyzeRule.getString(intro ?: "") searchBook.intro = analyzeRule.getString(intro ?: "")
SourceDebug.printLog( SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.intro, true)
bookSource.bookSourceUrl,
msg = searchBook.intro,
isHtml = true
)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取字数") SourceDebug.printLog(bookSource.bookSourceUrl, "获取字数")
searchBook.wordCount = analyzeRule.getString(wordCount ?: "") searchBook.wordCount = analyzeRule.getString(wordCount ?: "")
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.wordCount) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.wordCount)
@ -174,43 +170,34 @@ object BookList {
searchBook.originOrder = bookSource.customOrder searchBook.originOrder = bookSource.customOrder
analyzeRule.setBook(searchBook) analyzeRule.setBook(searchBook)
analyzeRule.setContent(item) analyzeRule.setContent(item)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取书名", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取书名", printLog)
searchBook.name = analyzeRule.getString(ruleName) searchBook.name = analyzeRule.getString(ruleName)
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.name, print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.name, printLog)
if (searchBook.name.isNotEmpty()) { if (searchBook.name.isNotEmpty()) {
SourceDebug.printLog(bookSource.bookSourceUrl, "获取书籍Url", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取书籍Url", printLog)
searchBook.bookUrl = analyzeRule.getString(ruleBookUrl, true) searchBook.bookUrl = analyzeRule.getString(ruleBookUrl, true)
if (searchBook.bookUrl.isEmpty()) { if (searchBook.bookUrl.isEmpty()) {
searchBook.bookUrl = baseUrl searchBook.bookUrl = baseUrl
} }
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.bookUrl, print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.bookUrl, printLog)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取作者", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取作者", printLog)
searchBook.author = BookHelp.formatAuthor(analyzeRule.getString(ruleAuthor)) searchBook.author = BookHelp.formatAuthor(analyzeRule.getString(ruleAuthor))
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.author, print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.author, printLog)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取分类", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取分类", printLog)
searchBook.kind = analyzeRule.getString(ruleKind) searchBook.kind = analyzeRule.getString(ruleKind)
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.kind, print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.kind, printLog)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取简介", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取简介", printLog)
searchBook.intro = analyzeRule.getString(ruleIntro) searchBook.intro = analyzeRule.getString(ruleIntro)
SourceDebug.printLog( SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.intro, printLog, true)
bookSource.bookSourceUrl, SourceDebug.printLog(bookSource.bookSourceUrl, "获取字数", printLog)
searchBook.intro,
print = printLog,
isHtml = true
)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取字数", print = printLog)
searchBook.wordCount = analyzeRule.getString(ruleWordCount) searchBook.wordCount = analyzeRule.getString(ruleWordCount)
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.wordCount, print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.wordCount, printLog)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取封面Url", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取封面Url", printLog)
searchBook.coverUrl = analyzeRule.getString(ruleCoverUrl, true) searchBook.coverUrl = analyzeRule.getString(ruleCoverUrl, true)
SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.coverUrl, print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.coverUrl, printLog)
SourceDebug.printLog(bookSource.bookSourceUrl, "获取最新章节", print = printLog) SourceDebug.printLog(bookSource.bookSourceUrl, "获取最新章节", printLog)
searchBook.latestChapterTitle = analyzeRule.getString(ruleLastChapter) searchBook.latestChapterTitle = analyzeRule.getString(ruleLastChapter)
SourceDebug.printLog( SourceDebug.printLog(bookSource.bookSourceUrl, searchBook.latestChapterTitle, printLog)
bookSource.bookSourceUrl,
searchBook.latestChapterTitle,
print = printLog
)
return searchBook return searchBook
} }
return null return null

18
app/src/main/java/io/legado/app/model/webbook/SourceDebug.kt
Unescape View File

@ -25,10 +25,10 @@ class SourceDebug(private val webBook: WebBook, callback: Callback) {
fun printLog( fun printLog(
sourceUrl: String?, sourceUrl: String?,
msg: String?, msg: String?,
state: Int = 1,
print: Boolean = true, print: Boolean = true,
isHtml: Boolean = false, isHtml: Boolean = false,
showTime: Boolean = true showTime: Boolean = true,
state: Int = 1
) { ) {
if (debugSource != sourceUrl || callback == null || !print) return if (debugSource != sourceUrl || callback == null || !print) return
var printMsg = msg ?: "" var printMsg = msg ?: ""
@ -82,12 +82,12 @@ class SourceDebug(private val webBook: WebBook, callback: Callback) {
printLog(debugSource, "", showTime = false) printLog(debugSource, "", showTime = false)
infoDebug(searchBooks[0].toBook()) infoDebug(searchBooks[0].toBook())
} else { } else {
printLog(debugSource, "未获取到书籍", -1) printLog(debugSource, "未获取到书籍", state = -1)
} }
} }
} }
.onError { .onError {
printLog(debugSource, it.localizedMessage, -1) printLog(debugSource, it.localizedMessage, state = -1)
} }
tasks.add(search) tasks.add(search)
} }
@ -101,7 +101,7 @@ class SourceDebug(private val webBook: WebBook, callback: Callback) {
tocDebug(book) tocDebug(book)
} }
.onError { .onError {
printLog(debugSource, it.localizedMessage, -1) printLog(debugSource, it.localizedMessage, state = -1)
} }
tasks.add(info) tasks.add(info)
} }
@ -117,12 +117,12 @@ class SourceDebug(private val webBook: WebBook, callback: Callback) {
val nextChapterUrl = if (it.size > 1) it[1].url else null val nextChapterUrl = if (it.size > 1) it[1].url else null
contentDebug(book, it[0], nextChapterUrl) contentDebug(book, it[0], nextChapterUrl)
} else { } else {
printLog(debugSource, "目录列表为空", -1) printLog(debugSource, "目录列表为空", state = -1)
} }
} }
} }
.onError { .onError {
printLog(debugSource, it.localizedMessage, -1) printLog(debugSource, it.localizedMessage, state = -1)
} }
tasks.add(chapterList) tasks.add(chapterList)
} }
@ -132,11 +132,11 @@ class SourceDebug(private val webBook: WebBook, callback: Callback) {
val content = webBook.getContent(book, bookChapter, nextChapterUrl) val content = webBook.getContent(book, bookChapter, nextChapterUrl)
.onSuccess { content -> .onSuccess { content ->
content?.let { content?.let {
printLog(debugSource, it, 1000) printLog(debugSource, it, state = 1000)
} }
} }
.onError { .onError {
printLog(debugSource, it.localizedMessage, -1) printLog(debugSource, it.localizedMessage, state = -1)
} }
tasks.add(content) tasks.add(content)
} }

Write Preview
Loading…
Cancel
Save