mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-08-15 00:48:28 +00:00
Code Issues Projects Releases Wiki Activity

Reduce code dup

Browse Source
This commit is contained in:
7x11x13 2025-01-01 17:47:30 -05:00
parent ec7250f145
commit 460ff55014
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
yt_dlp/utils/_utils.py
View File

@ -2460,31 +2460,30 @@ def __init__(self, ydl, info_dict):
@classmethod @classmethod
def parse_playlist_items(cls, string, playlist_index): def parse_playlist_items(cls, string, playlist_index):
def slice_from_mobj(segment, mobj):
start, end, step, has_range = mobj.group('start', 'end', 'step', 'range')
if int_or_none(step) == 0:
raise ValueError(f'Step in {segment!r} cannot be zero')
return (
slice(int_or_none(start), float_or_none(end), int_or_none(step))
if has_range
else slice(int(start), int(start))
)
for segment in string.split(','): for segment in string.split(','):
if not segment: if not segment:
raise ValueError('There are two or more consecutive commas') raise ValueError('There are two or more consecutive commas')
mobj = cls.PLAYLIST_ITEMS_RE.fullmatch(segment) mobj = cls.PLAYLIST_ITEMS_RE.fullmatch(segment)
if mobj: if mobj:
start, end, step, has_range = mobj.group('start', 'end', 'step', 'range') yield slice_from_mobj(segment, mobj)
if int_or_none(step) == 0:
raise ValueError(f'Step in {segment!r} cannot be zero')
yield slice(int_or_none(start), float_or_none(end), int_or_none(step)) if has_range else int(start)
continue continue
if not cls.NESTED_PLAYLIST_RE.fullmatch(segment): if not cls.NESTED_PLAYLIST_RE.fullmatch(segment):
raise ValueError(f'{segment!r} is not a valid specification') raise ValueError(f'{segment!r} is not a valid specification')
for depth, mobj in enumerate(cls.NESTED_PLAYLIST_SEGMENT_RE.finditer(segment)): for depth, mobj in enumerate(cls.NESTED_PLAYLIST_SEGMENT_RE.finditer(segment)):
start, end, step, has_range = mobj.group('start', 'end', 'step', 'range') slice_ = slice_from_mobj(segment, mobj)
if int_or_none(step) == 0:
raise ValueError(f'Step in {segment!r} cannot be zero')
slice_ = (
slice(int_or_none(start), float_or_none(end), int_or_none(step))
if has_range
else slice(int(start), int(start))
)
if depth == len(playlist_index): if depth == len(playlist_index):
yield slice_ yield slice_
break break