kumi/yt-dlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix archive bug introduced in 8b0d7497d5

Browse source
This commit is contained in:
pukkandan 2021-01-13 20:54:13 +05:30
parent 8b0d7497d5
commit d83cb5312c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
youtube_dlc/YoutubeDL.py
View file

@ -842,9 +842,9 @@ class YoutubeDL(object):
reason = check_filter() reason = check_filter()
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'): if reason.endswith('has already been recorded in the archive') and self.params.get('break_on_existing', False):
raise ExistingVideoReached() raise ExistingVideoReached()
elif self.params.get('break_on_reject'): elif self.params.get('break_on_reject', False):
raise RejectedVideoReached() raise RejectedVideoReached()
return reason return reason
@ -1110,7 +1110,8 @@ class YoutubeDL(object):
'extractor_key': ie_result['extractor_key'], 'extractor_key': ie_result['extractor_key'],
} }
self._match_entry(entry, incomplete=True) if self._match_entry(entry, incomplete=True) is not None:
continue
entry_result = self.__process_iterable_entry(entry, download, extra) entry_result = self.__process_iterable_entry(entry, download, extra)
# TODO: skip failed (empty) entries? # TODO: skip failed (empty) entries?
@ -2266,10 +2267,10 @@ class YoutubeDL(object):
self.to_screen('[info] Maximum number of downloaded files reached') self.to_screen('[info] Maximum number of downloaded files reached')
raise raise
except ExistingVideoReached: except ExistingVideoReached:
self.to_screen('[info] Encountered a file that did not match filter, stopping due to --break-on-reject') self.to_screen('[info] Encountered a file that is already in the archive, stopping due to --break-on-existing')
raise raise
except RejectedVideoReached: except RejectedVideoReached:
self.to_screen('[info] Encountered a file that is already in the archive, stopping due to --break-on-existing') self.to_screen('[info] Encountered a file that did not match filter, stopping due to --break-on-reject')
raise raise
else: else:
if self.params.get('dump_single_json', False): if self.params.get('dump_single_json', False):