diff --git a/app/src/main/java/com/github/catvod/utils/DownloadMT.kt b/app/src/main/java/com/github/catvod/utils/DownloadMT.kt index 7562b090..29a5463a 100644 --- a/app/src/main/java/com/github/catvod/utils/DownloadMT.kt +++ b/app/src/main/java/com/github/catvod/utils/DownloadMT.kt @@ -5,7 +5,6 @@ import com.github.catvod.net.OkHttp import com.github.catvod.utils.ProxyVideo.getInfo import com.github.catvod.utils.ProxyVideo.getMimeType import com.github.catvod.utils.ProxyVideo.parseRange -import com.github.catvod.utils.ProxyVideo.proxy import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -21,24 +20,25 @@ import java.io.ByteArrayOutputStream import kotlin.math.min object DownloadMT { - val CORE_NUM: Int = Runtime.getRuntime().availableProcessors() + val THREAD_NUM: Int = Runtime.getRuntime().availableProcessors() * 2 private val infos = mutableMapOf>(); fun proxyMultiThread(url: String, headers: Map): Array? = runBlocking { - proxyAsync(url, headers) + proxy(url, headers) } - suspend fun proxyAsync(url: String, headers: Map): Array? { + suspend fun proxy(url: String, headers: Map): Array? { /* val service = Executors.newFixedThreadPool(THREAD_NUM)*/ - SpiderDebug.log("--proxyMultiThread: CORE_NUM " + CORE_NUM) - //默认线程数核心数两倍 - var threadNum = CORE_NUM * 2 + SpiderDebug.log("--proxyMultiThread: THREAD_NUM " + THREAD_NUM) + try { //缓存，避免每次都请求total等信息 + + var info = infos[url] if (info == null) { infos.clear() @@ -47,7 +47,7 @@ object DownloadMT { } val code = info?.get(0) as Int - SpiderDebug.log("-----------code:$code") + SpiderDebug.log("-----------code:" + code) if (code != 206) { return proxy(url, headers) } @@ -60,19 +60,10 @@ object DownloadMT { val total = StringUtils.split(contentRange, "/")[1] SpiderDebug.log("--文件总大小:$total") - //如果文件小于50MB，也不走代理 - if (total.toLong() < 1024 * 1024 * 50L) { - return proxy(url, headers) - } else if (total.toLong() < 1024 * 1024 * 1024L * 10L) { - //10GB以下 - threadNum = CORE_NUM * 3 - } else if (total.toLong() < 1024 * 1024 * 1024L * 40L) { - //40GB以下 - threadNum = CORE_NUM * 4 - } else { - //40GB以上 - threadNum = CORE_NUM * 5 - } + //如果文件太小，也不走代理 + /* if (total.toLong() < 1024 * 1024 * 100) { + return proxy(url, headers) + }*/ var range = if (StringUtils.isAllBlank(headers["range"])) headers["Range"] else headers["range"] if (StringUtils.isAllBlank(range)) range = "bytes=0-"; @@ -80,16 +71,13 @@ object DownloadMT { val rangeObj = parseRange( range!! ) + //没有range,无需分割 - //视频开始，加大线程数 - if (rangeObj["start"]!!.toLong() == 0L) { - threadNum = CORE_NUM * 4 - } - val partList = generatePart(rangeObj, total, threadNum) + val partList = generatePart(rangeObj, total) // 存储执行结果的List val jobs = mutableListOf() - val channels = List(threadNum) { Channel() } + val channels = List(THREAD_NUM) { Channel() } for ((index, part) in partList.withIndex()) { @@ -154,11 +142,11 @@ object DownloadMT { /* respHeaders.put("Access-Control-Allow-Credentials", "true"); respHeaders.put("Access-Control-Allow-Origin", "*");*/ resHeader["Content-Length"] = - (partList[threadNum - 1][1] - partList[0][0] + 1).toString() + (partList[THREAD_NUM - 1][1] - partList[0][0] + 1).toString() resHeader.remove("content-length") resHeader["Content-Range"] = String.format( - "bytes %s-%s/%s", partList[0][0], partList[threadNum - 1][1], total + "bytes %s-%s/%s", partList[0][0], partList[THREAD_NUM - 1][1], total ) resHeader.remove("content-range") @@ -178,33 +166,24 @@ object DownloadMT { } } - private fun generatePart( - rangeObj: Map, total: String, threadNum: Int - ): List { + fun generatePart(rangeObj: Map, total: String): List { val totalSize = total.toLong() - - //默认8MB - var partSize = 1024 * 1024 * 8L - - if (totalSize < 1024 * 1024 * 1024L * 10L) { - //10GB以下，分片8MB - partSize = 1024 * 1024 * 8L - } else { - //40GB以下，分片64MB - partSize = 1024 * 1024 * 8L * 8 - } + //超过10GB，分块是80Mb，不然是16MB + val partSize = + if (totalSize > 8L * 1024L * 1024L * 1024L * 10L) 1024 * 1024 * 8 * 10L else 1024 * 1024 * 8 * 2L var start = rangeObj["start"]!!.toLong() var end = - if (StringUtils.isAllBlank(rangeObj["end"])) start + partSize else rangeObj["end"]!!.toLong() + if (StringUtils.isAllBlank(rangeObj["end"])) start + partSize else rangeObj["end"]!! + .toLong() end = min(end.toDouble(), (totalSize - 1).toDouble()).toLong() val length = end - start + 1 - val size = length / threadNum + val size = length /THREAD_NUM val partList: MutableList = ArrayList() - for (i in 0..()); - "https://video.shipin520.com/videos/42/33/21/b_hsTXjZv04HeM1613423321_v1.mp4", new HashMap<>()); + "http://172.16.1.217:18089/ng-grid/video.mp4", new HashMap<>()); System.out.println(url); while (true) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index aa893278..5482b9ad 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index ebc951d9..067413bf 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -8b6de828883275e559c19d37c8dff9d1 +d62dc3073c5c2ff1bff14a5128c5d4dd diff --git a/json/index.json b/json/index.json index 82bd3234..b5c055e0 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;8b6de828883275e559c19d37c8dff9d1", + "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;d62dc3073c5c2ff1bff14a5128c5d4dd", "lives": [ { "name": "电视直播", diff --git a/json/test.json b/json/test.json index c153ca40..7d0d27bf 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadkt/jar/custom_spider.jar;md5;8b6de828883275e559c19d37c8dff9d1", + "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadkt/jar/custom_spider.jar;md5;d62dc3073c5c2ff1bff14a5128c5d4dd", "lives": [ { "name": "电视直播",