lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refine public proxy load

This commit is contained in:
世界 2021-02-23 10:25:39 +08:00
parent a9c96bca07
commit 68a544914d
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
TMessagesProj/src/main/java/tw/nekomimi/nekogram/parts/ProxyLoads.kt
View File

@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.telegram.messenger.FileLog
import tw.nekomimi.nekogram.utils.ProxyUtil.parseProxies
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicInteger
@ -24,14 +25,32 @@ fun loadProxies(urls: List<String>, exceptions: MutableMap<String, Exception>):
for (url in urls) {
launch(Dispatchers.IO) {
try {
val proxies = parseProxies(HttpUtil.get(url))
if (url.contains("https://gitee.com/") && cl.decrementAndGet() > 0) {
var subX = ""
var subY = ""
var urlFinal = url
if (url.count { it == '@' } == 2) {
subX = url.substringAfter("@")
.substringBefore("@")
subY = url.substringAfterLast("@")
urlFinal = url.substringBefore("@")
}
var content = HttpUtil.get(urlFinal)
if (subX.isNotBlank()) {
content = content.substringAfter(subX)
.substringBefore(subY)
}
val proxies = parseProxies(content)
if (urlFinal.contains("https://gitee.com/") && cl.decrementAndGet() > 0) {
defer = proxies
} else {
if (ret.getAndSet(true)) return@launch
it.resume(proxies)
}
FileLog.d(url)
FileLog.d("Success")
} catch (e: Exception) {
FileLog.d(url)
FileLog.e(e)
exceptions[url] = e
if (cl.decrementAndGet() == 0) {
if (defer != null) {

2
TMessagesProj/src/main/java/tw/nekomimi/nekogram/sub/SubManager.kt
View File

@ -26,8 +26,8 @@ object SubManager {
enable = public?.enable ?: true
urls = listOf(
"https://github.com/NekoX-Dev/ProxyList/blob/master/proxy_list@js-file-line\">@<",
"https://cdn.jsdelivr.net/gh/nekox-dev/ProxyList/proxy_list",
"https://raw.githubusercontent.com/nekox-dev/ProxyList/master/proxy_list",
"https://nekox-dev.github.io/ProxyList/proxy_list",
"https://gitee.com/nekoshizuku/AwesomeRepo/raw/master/proxy_list"
)