MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 15:16:52 +01:00
Code Issues Projects Releases Wiki Activity

[downloader/fragment] Fix problem where multiple threads can share one iterator

Browse Source 
which causes "ValueError: generator already executing" error

Closes #2881
This commit is contained in:
Lesmiscore 2022-02-25 13:22:17 +09:00
parent 15dfb3929c
commit f0734e1190
No known key found for this signature in database
GPG Key ID: 0EC2B52CF86236FF
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
yt_dlp/downloader/fragment.py
View File

@ -410,17 +410,16 @@ def bindoj_result(future):
def bindoj_result(future): def bindoj_result(future):
return future.result() return future.result()
def interrupt_trigger_iter(fg):
for f in fg:
if not interrupt_trigger[0]:
break
yield f
spins = [] spins = []
for idx, (ctx, fragments, info_dict) in enumerate(args): for idx, (ctx, fragments, info_dict) in enumerate(args):
tpe = FTPE(math.ceil(max_workers / max_progress)) tpe = FTPE(math.ceil(max_workers / max_progress))
job = tpe.submit(thread_func, idx, ctx, interrupt_trigger_iter(fragments), info_dict, tpe)
def interrupt_trigger_iter():
for f in fragments:
if not interrupt_trigger[0]:
break
yield f
job = tpe.submit(thread_func, idx, ctx, interrupt_trigger_iter(), info_dict, tpe)
spins.append((tpe, job)) spins.append((tpe, job))
result = True result = True