Public-Mirror/LunaTranslator
1
0
Fork 0
mirror of https://github.com/HIllya51/LunaTranslator.git synced 2024-12-29 16:44:13 +08:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
恍兮惚兮 2024-07-10 14:22:13 +08:00
parent 75cbb6f9ac
commit a441139fed
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
LunaTranslator/LunaTranslator/network/libcurl/requester.py
View File

@ -53,17 +53,26 @@ def ExceptionFilter(func):
return _wrapper return _wrapper
class autostatus:
def __init__(self, ref) -> None:
self.ref = ref
ref.occupied = True
def __del__(self):
self.ref.occupied = False
class Requester(Requester_common): class Requester(Requester_common):
Accept_Encoding = "gzip, deflate, br, zstd" Accept_Encoding = "gzip, deflate, br, zstd"
def __init__(self) -> None: def __init__(self) -> None:
self._tls = threading.local() # 用tls不太行，因为为了防止阻塞，每次请求都是完全重新开的线程，会100%重新initcurl
self._tls.curl = self.initcurl() self.occupied = 0
self.curl = self.initcurl()
def initcurl(self): def initcurl(self):
curl = AutoCURLHandle(curl_easy_init()) curl = AutoCURLHandle(curl_easy_init())
curl_easy_setopt(curl, CURLoption.COOKIEJAR, "")
curl_easy_setopt(curl, CURLoption.USERAGENT, self.default_UA.encode("utf8")) curl_easy_setopt(curl, CURLoption.USERAGENT, self.default_UA.encode("utf8"))
return curl return curl
@ -131,12 +140,6 @@ class Requester(Requester_common):
elif isinstance(headerqueue, list): elif isinstance(headerqueue, list):
return b"".join(headerqueue).decode("utf8") return b"".join(headerqueue).decode("utf8")
@property
def curl(self):
if not getattr(self._tls, "curl", None):
self._tls.curl = self.initcurl()
return self._tls.curl
def _setheaders(self, curl, headers, cookies): def _setheaders(self, curl, headers, cookies):
lheaders = Autoslist() lheaders = Autoslist()
for _ in self._parseheader(headers, None): for _ in self._parseheader(headers, None):
@ -169,8 +172,14 @@ class Requester(Requester_common):
timeout, timeout,
allow_redirects, allow_redirects,
): ):
if self.occupied == False:
curl = self.curl curl = self.curl
__ = autostatus(self)
else:
curl = self.initcurl()
__ = 0
curl_easy_setopt(curl, CURLoption.COOKIEJAR, "")
if timeout: if timeout:
curl_easy_setopt(curl, CURLoption.TIMEOUT_MS, timeout) curl_easy_setopt(curl, CURLoption.TIMEOUT_MS, timeout)
curl_easy_setopt(curl, CURLoption.CONNECTTIMEOUT_MS, timeout) curl_easy_setopt(curl, CURLoption.CONNECTTIMEOUT_MS, timeout)
@ -197,7 +206,7 @@ class Requester(Requester_common):
resp = Response() resp = Response()
resp.keeprefs.append(curl) resp.keeprefs.append(curl)
resp.keeprefs.append(__)
if stream: if stream:
headerqueue = queue.Queue() headerqueue = queue.Queue()
_notif = headerqueue _notif = headerqueue