kt携程版本
This commit is contained in:
parent
ad148795a8
commit
8a169467c0
|
|
@ -29,7 +29,7 @@ object DownloadMT {
|
||||||
/* val service = Executors.newFixedThreadPool(THREAD_NUM)
|
/* val service = Executors.newFixedThreadPool(THREAD_NUM)
|
||||||
SpiderDebug.log("--proxyMultiThread: THREAD_NUM " + THREAD_NUM)*/
|
SpiderDebug.log("--proxyMultiThread: THREAD_NUM " + THREAD_NUM)*/
|
||||||
|
|
||||||
val `in`: SequenceInputStream?
|
val seqInputStream: SequenceInputStream?
|
||||||
try {
|
try {
|
||||||
//缓存,避免每次都请求total等信息
|
//缓存,避免每次都请求total等信息
|
||||||
|
|
||||||
|
|
@ -108,17 +108,17 @@ object DownloadMT {
|
||||||
jobs.joinAll()
|
jobs.joinAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
`in` = SequenceInputStream(Vector(inputStreams).elements())
|
seqInputStream = SequenceInputStream(Vector(inputStreams).elements())
|
||||||
|
|
||||||
|
|
||||||
// SpiderDebug.log(" ++proxy res data:" + Json.toJson(response.body()));
|
// SpiderDebug.log(" ++proxy res data:" + Json.toJson(response.body()));
|
||||||
var contentType: String? = if (StringUtils.isAllBlank(
|
var contentType: String? = resHeader["Content-Type"]
|
||||||
resHeader["Content-Type"]
|
if (StringUtils.isAllBlank(contentType)) {
|
||||||
)
|
contentType = resHeader["content-type"]
|
||||||
) resHeader["content-type"] else resHeader["Content-Type"]
|
}
|
||||||
val contentDisposition: String = resHeader["Content-Disposition"]!!.toString()
|
|
||||||
if (StringUtils.isAllBlank(contentType)&& StringUtils.isNoneBlank(contentDisposition)) {
|
if (StringUtils.isAllBlank(contentType) && StringUtils.isNoneBlank(resHeader["Content-Disposition"])) {
|
||||||
contentType = getMimeType(contentDisposition)
|
contentType = getMimeType(resHeader["Content-Disposition"])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -131,10 +131,11 @@ object DownloadMT {
|
||||||
"bytes %s-%s/%s", partList[0][0], partList[THREAD_NUM - 1][1], total
|
"bytes %s-%s/%s", partList[0][0], partList[THREAD_NUM - 1][1], total
|
||||||
)
|
)
|
||||||
// respHeaders.put("content-range", String.format("bytes %s-%s/%s", partList.get(0)[0], partList.get(THREAD_NUM - 1)[1], total));
|
// respHeaders.put("content-range", String.format("bytes %s-%s/%s", partList.get(0)[0], partList.get(THREAD_NUM - 1)[1], total));
|
||||||
SpiderDebug.log("++proxy res contentType:$contentType")
|
SpiderDebug.log("----proxy res contentType:$contentType")
|
||||||
// SpiderDebug.log("++proxy res body:" + response.body());
|
// SpiderDebug.log("++proxy res body:" + response.body());
|
||||||
SpiderDebug.log("++proxy res respHeaders:" + Json.toJson(resHeader))
|
SpiderDebug.log("----proxy res respHeaders:" + Json.toJson(resHeader))
|
||||||
return arrayOf(206, contentType, `in`, resHeader)
|
SpiderDebug.log("----proxy inputstream:$seqInputStream")
|
||||||
|
return arrayOf(206, contentType, seqInputStream, resHeader)
|
||||||
|
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
SpiderDebug.log("proxyMultiThread error:" + e.message)
|
SpiderDebug.log("proxyMultiThread error:" + e.message)
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1 +1 @@
|
||||||
2d18b21a13a3e7b982f1d1642d975c9b
|
d7d6052ea18536e48b17bdfb64a06a39
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadkt/jar/custom_spider.jar;md5;2d18b21a13a3e7b982f1d1642d975c9b",
|
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadkt/jar/custom_spider.jar;md5;d7d6052ea18536e48b17bdfb64a06a39",
|
||||||
"lives": [
|
"lives": [
|
||||||
{
|
{
|
||||||
"name": "电视直播",
|
"name": "电视直播",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue