优化
This commit is contained in:
@@ -41,35 +41,36 @@ object WebBook {
|
|||||||
key: String,
|
key: String,
|
||||||
page: Int? = 1,
|
page: Int? = 1,
|
||||||
): ArrayList<SearchBook> {
|
): ArrayList<SearchBook> {
|
||||||
val ruleData = RuleData()
|
val searchUrl = bookSource.searchUrl
|
||||||
bookSource.searchUrl?.let { searchUrl ->
|
if (searchUrl.isNullOrBlank()) {
|
||||||
val analyzeUrl = AnalyzeUrl(
|
throw NoStackTraceException("搜索url不能为空")
|
||||||
mUrl = searchUrl,
|
|
||||||
key = key,
|
|
||||||
page = page,
|
|
||||||
baseUrl = bookSource.bookSourceUrl,
|
|
||||||
headerMapF = bookSource.getHeaderMap(true),
|
|
||||||
source = bookSource,
|
|
||||||
ruleData = ruleData,
|
|
||||||
)
|
|
||||||
var res = analyzeUrl.getStrResponseAwait()
|
|
||||||
//检测书源是否已登录
|
|
||||||
bookSource.loginCheckJs?.let { checkJs ->
|
|
||||||
if (checkJs.isNotBlank()) {
|
|
||||||
res = analyzeUrl.evalJS(checkJs, res) as StrResponse
|
|
||||||
}
|
|
||||||
}
|
|
||||||
checkRedirect(bookSource, res)
|
|
||||||
return BookList.analyzeBookList(
|
|
||||||
bookSource = bookSource,
|
|
||||||
ruleData = ruleData,
|
|
||||||
analyzeUrl = analyzeUrl,
|
|
||||||
baseUrl = res.url,
|
|
||||||
body = res.body,
|
|
||||||
isSearch = true
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
return arrayListOf()
|
val ruleData = RuleData()
|
||||||
|
val analyzeUrl = AnalyzeUrl(
|
||||||
|
mUrl = searchUrl,
|
||||||
|
key = key,
|
||||||
|
page = page,
|
||||||
|
baseUrl = bookSource.bookSourceUrl,
|
||||||
|
headerMapF = bookSource.getHeaderMap(true),
|
||||||
|
source = bookSource,
|
||||||
|
ruleData = ruleData,
|
||||||
|
)
|
||||||
|
var res = analyzeUrl.getStrResponseAwait()
|
||||||
|
//检测书源是否已登录
|
||||||
|
bookSource.loginCheckJs?.let { checkJs ->
|
||||||
|
if (checkJs.isNotBlank()) {
|
||||||
|
res = analyzeUrl.evalJS(checkJs, res) as StrResponse
|
||||||
|
}
|
||||||
|
}
|
||||||
|
checkRedirect(bookSource, res)
|
||||||
|
return BookList.analyzeBookList(
|
||||||
|
bookSource = bookSource,
|
||||||
|
ruleData = ruleData,
|
||||||
|
analyzeUrl = analyzeUrl,
|
||||||
|
baseUrl = res.url,
|
||||||
|
body = res.body,
|
||||||
|
isSearch = true
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user