administration/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-17 22:51:45 +00:00
Code Issues Projects Releases Wiki Activity

[cleanup] _match_entry

Browse Source
This commit is contained in:
pukkandan 2021-05-29 02:12:07 +05:30
parent 65af1839c6
commit c77495e3a4
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_YoutubeDL.py
View File

@ -756,7 +756,7 @@ class TestYoutubeDL(unittest.TestCase):
def process_info(self, info_dict): def process_info(self, info_dict):
super(YDL, self).process_info(info_dict) super(YDL, self).process_info(info_dict)
def _match_entry(self, info_dict, incomplete): def _match_entry(self, info_dict, incomplete=False):
res = super(FilterYDL, self)._match_entry(info_dict, incomplete) res = super(FilterYDL, self)._match_entry(info_dict, incomplete)
if res is None: if res is None:
self.downloaded_info_dicts.append(info_dict) self.downloaded_info_dicts.append(info_dict)

20
yt_dlp/YoutubeDL.py
View File

@ -1016,11 +1016,12 @@ class YoutubeDL(object):
path = encodeFilename(path, True).decode(preferredencoding()) path = encodeFilename(path, True).decode(preferredencoding())
return sanitize_path(path, force=self.params.get('windowsfilenames')) return sanitize_path(path, force=self.params.get('windowsfilenames'))
def _match_entry(self, info_dict, incomplete): def _match_entry(self, info_dict, incomplete=False):
""" Returns None if the file should be downloaded """ """ Returns None if the file should be downloaded """
def check_filter():
video_title = info_dict.get('title', info_dict.get('id', 'video')) video_title = info_dict.get('title', info_dict.get('id', 'video'))
def check_filter():
if 'title' in info_dict: if 'title' in info_dict:
# This can happen when we're just evaluating the playlist # This can happen when we're just evaluating the playlist
title = info_dict['title'] title = info_dict['title']
@ -1047,8 +1048,6 @@ class YoutubeDL(object):
return 'Skipping %s, because it has exceeded the maximum view count (%d/%d)' % (video_title, view_count, max_views) return 'Skipping %s, because it has exceeded the maximum view count (%d/%d)' % (video_title, view_count, max_views)
if age_restricted(info_dict.get('age_limit'), self.params.get('age_limit')): if age_restricted(info_dict.get('age_limit'), self.params.get('age_limit')):
return 'Skipping "%s" because it is age restricted' % video_title return 'Skipping "%s" because it is age restricted' % video_title
if self.in_download_archive(info_dict):
return '%s has already been recorded in archive' % video_title
if not incomplete: if not incomplete:
match_filter = self.params.get('match_filter') match_filter = self.params.get('match_filter')
@ -1058,13 +1057,16 @@ class YoutubeDL(object):
return ret return ret
return None return None
if self.in_download_archive(info_dict):
reason = '%s has already been recorded in the archive' % video_title
break_opt, break_err = 'break_on_existing', ExistingVideoReached
else:
reason = check_filter() reason = check_filter()
break_opt, break_err = 'break_on_reject', RejectedVideoReached
if reason is not None: if reason is not None:
self.to_screen('[download] ' + reason) self.to_screen('[download] ' + reason)
if reason.endswith('has already been recorded in the archive') and self.params.get('break_on_existing', False): if self.params.get(break_opt, False):
raise ExistingVideoReached() raise break_err()
elif self.params.get('break_on_reject', False):
raise RejectedVideoReached()
return reason return reason
@staticmethod @staticmethod
@ -2327,7 +2329,7 @@ class YoutubeDL(object):
if 'format' not in info_dict: if 'format' not in info_dict:
info_dict['format'] = info_dict['ext'] info_dict['format'] = info_dict['ext']
if self._match_entry(info_dict, incomplete=False) is not None: if self._match_entry(info_dict) is not None:
return return
self.post_extract(info_dict) self.post_extract(info_dict)