xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-12-12 00:52:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Treat multiple --match-filters as OR

Browse Source 
Closes #3144
This commit is contained in:
pukkandan
2022-03-25 13:32:54 +05:30
parent 28787f16c6
commit b1a7cd056a
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yt_dlp/utils.py
View File

@@ -3614,16 +3614,18 @@ def match_str(filter_str, dct, incomplete=False):
for filter_part in re.split(r'(?<!\\)&', filter_str))
def match_filter_func(filter_str):
if filter_str is None:
def match_filter_func(filters):
if not filters:
return None
filters = variadic(filters)
def _match_func(info_dict, *args, **kwargs):
if match_str(filter_str, info_dict, *args, **kwargs):
if any(match_str(f, info_dict, *args, **kwargs) for f in filters):
return None
else:
video_title = info_dict.get('title', info_dict.get('id', 'video'))
return '%s does not pass filter %s, skipping ..' % (video_title, filter_str)
video_title = info_dict.get('title') or info_dict.get('id') or 'video'
filter_str = ') | ('.join(map(str.strip, filters))
return f'{video_title} does not pass filter ({filter_str}), skipping ..'
return _match_func