aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpukkandan <pukkandan@gmail.com>2021-01-13 20:54:13 +0530
committerpukkandan <pukkandan@gmail.com>2021-01-13 21:03:50 +0530
commitd83cb5312c19711ce77b66ad942269947a0fd94c (patch)
treea345d713217e5697f08c685f3dd102286c0b68e1
parent8b0d7497d536b93610d469b6e3fd2935fb3cb8a0 (diff)
downloadhypervideo-pre-d83cb5312c19711ce77b66ad942269947a0fd94c.tar.lz
hypervideo-pre-d83cb5312c19711ce77b66ad942269947a0fd94c.tar.xz
hypervideo-pre-d83cb5312c19711ce77b66ad942269947a0fd94c.zip
Fix archive bug introduced in 8b0d7497d536b93610d469b6e3fd2935fb3cb8a0
-rw-r--r--youtube_dlc/YoutubeDL.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py
index dadf500c4..5141159d2 100644
--- a/youtube_dlc/YoutubeDL.py
+++ b/youtube_dlc/YoutubeDL.py
@@ -842,9 +842,9 @@ class YoutubeDL(object):
reason = check_filter()
if reason is not None:
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()
- elif self.params.get('break_on_reject'):
+ elif self.params.get('break_on_reject', False):
raise RejectedVideoReached()
return reason
@@ -1110,7 +1110,8 @@ class YoutubeDL(object):
'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)
# TODO: skip failed (empty) entries?
@@ -2266,10 +2267,10 @@ class YoutubeDL(object):
self.to_screen('[info] Maximum number of downloaded files reached')
raise
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
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
else:
if self.params.get('dump_single_json', False):