Compare commits

..

2 Commits

Author SHA1 Message Date
Lesmiscore
69b59b4b4b
[downloader/fc2] Stop heatbeating once FFmpeg finishes
Authored by: Lesmiscore
2022-04-25 00:45:25 +09:00
Lesmiscore
acbc642250
[utils] WebSocketsWrapper: Ignore warnings at websockets instantiation
This also fixes crash caused by moving asyncio to .compat.

Authored by: Lesmiscore
Thanks: J.Chung at Discord (581418557871620106)
2022-04-25 00:44:30 +09:00
2 changed files with 21 additions and 7 deletions

View File

@ -18,6 +18,9 @@ class FC2LiveFD(FileDownloader):
heartbeat_state = [None, 1]
def heartbeat():
if heartbeat_state[1] < 0:
return
try:
heartbeat_state[1] += 1
ws.send('{"name":"heartbeat","arguments":{},"id":%d}' % heartbeat_state[1])
@ -36,4 +39,8 @@ class FC2LiveFD(FileDownloader):
'ws': None,
'protocol': 'live_ffmpeg',
})
try:
return FFmpegFD(self.ydl, self.params or {}).download(filename, new_info_dict)
finally:
# stop heartbeating
heartbeat_state[1] = -1

View File

@ -36,6 +36,7 @@ import tempfile
import time
import traceback
import urllib.parse
import warnings
import xml.etree.ElementTree
import zlib
@ -5221,7 +5222,11 @@ class WebSocketsWrapper():
pool = None
def __init__(self, url, headers=None, connect=True):
self.loop = asyncio.events.new_event_loop()
self.loop = asyncio.new_event_loop()
with warnings.catch_warnings():
warnings.simplefilter("ignore")
# https://github.com/aaugustin/websockets/blob/9c87d43f1d7bbf6847350087aae74fd35f73a642/src/websockets/legacy/client.py#L480
# the reason to keep giving `loop` parameter: we aren't in async function
self.conn = websockets.connect(
url, extra_headers=headers, ping_interval=None,
close_timeout=float('inf'), loop=self.loop, ping_timeout=float('inf'))
@ -5231,6 +5236,8 @@ class WebSocketsWrapper():
def __enter__(self):
if not self.pool:
with warnings.catch_warnings():
warnings.simplefilter("ignore")
self.pool = self.run_with_loop(self.conn.__aenter__(), self.loop)
return self
@ -5251,7 +5258,7 @@ class WebSocketsWrapper():
# for contributors: If there's any new library using asyncio needs to be run in non-async, move these function out of this class
@staticmethod
def run_with_loop(main, loop):
if not asyncio.coroutines.iscoroutine(main):
if not asyncio.iscoroutine(main):
raise ValueError(f'a coroutine was expected, got {main!r}')
try: