mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-10 15:14:57 +00:00
[utils] WebSocketsWrapper: Allow omitting __enter__
invocation (#3187)
Authored by: Lesmiscore
This commit is contained in:
parent
b1a7cd056a
commit
3cea3edd1a
2 changed files with 5 additions and 3 deletions
|
@ -212,7 +212,6 @@ class FC2LiveIE(InfoExtractor):
|
||||||
'Accept': '*/*',
|
'Accept': '*/*',
|
||||||
'User-Agent': std_headers['User-Agent'],
|
'User-Agent': std_headers['User-Agent'],
|
||||||
})
|
})
|
||||||
ws.__enter__()
|
|
||||||
|
|
||||||
self.write_debug('[debug] Sending HLS server request')
|
self.write_debug('[debug] Sending HLS server request')
|
||||||
|
|
||||||
|
|
|
@ -5436,15 +5436,18 @@ class Config:
|
||||||
class WebSocketsWrapper():
|
class WebSocketsWrapper():
|
||||||
"""Wraps websockets module to use in non-async scopes"""
|
"""Wraps websockets module to use in non-async scopes"""
|
||||||
|
|
||||||
def __init__(self, url, headers=None):
|
def __init__(self, url, headers=None, connect=True):
|
||||||
self.loop = asyncio.events.new_event_loop()
|
self.loop = asyncio.events.new_event_loop()
|
||||||
self.conn = compat_websockets.connect(
|
self.conn = compat_websockets.connect(
|
||||||
url, extra_headers=headers, ping_interval=None,
|
url, extra_headers=headers, ping_interval=None,
|
||||||
close_timeout=float('inf'), loop=self.loop, ping_timeout=float('inf'))
|
close_timeout=float('inf'), loop=self.loop, ping_timeout=float('inf'))
|
||||||
|
if connect:
|
||||||
|
self.__enter__()
|
||||||
atexit.register(self.__exit__, None, None, None)
|
atexit.register(self.__exit__, None, None, None)
|
||||||
|
|
||||||
def __enter__(self):
|
def __enter__(self):
|
||||||
self.pool = self.run_with_loop(self.conn.__aenter__(), self.loop)
|
if not self.pool:
|
||||||
|
self.pool = self.run_with_loop(self.conn.__aenter__(), self.loop)
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def send(self, *args):
|
def send(self, *args):
|
||||||
|
|
Loading…
Reference in a new issue