aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpukkandan <pukkandan@gmail.com>2021-01-30 17:37:05 +0530
committerpukkandan <pukkandan@gmail.com>2021-01-30 18:07:21 +0530
commitaf819c216fb8088645d06db29f50bcb25cc33a2b (patch)
treec65f75f2edf3d36a1b264833cfd46d648925fcb5
parente3b771a898728fd5df406104f2a18eeaf98ea654 (diff)
downloadhypervideo-pre-af819c216fb8088645d06db29f50bcb25cc33a2b.tar.lz
hypervideo-pre-af819c216fb8088645d06db29f50bcb25cc33a2b.tar.xz
hypervideo-pre-af819c216fb8088645d06db29f50bcb25cc33a2b.zip
[postprocessor] Raise errors correctly
Previously, when a postprocessor reported error, the download was still considered a success. This causes issues especially with critical PPs like Merger, MoveFiles etc :ci skip dl
-rw-r--r--youtube_dlc/YoutubeDL.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py
index 62f702356..8aa0b7fbd 100644
--- a/youtube_dlc/YoutubeDL.py
+++ b/youtube_dlc/YoutubeDL.py
@@ -2145,8 +2145,8 @@ class YoutubeDL(object):
else:
try:
self.post_process(full_filename, info_dict, files_to_move)
- except (PostProcessingError) as err:
- self.report_error('postprocessing: %s' % str(err))
+ except PostProcessingError as err:
+ self.report_error('Postprocessing: %s' % str(err))
return
if self.params.get('writeinfojson', False):
@@ -2394,8 +2394,8 @@ class YoutubeDL(object):
try:
self.post_process(dl_filename, info_dict, files_to_move)
- except (PostProcessingError) as err:
- self.report_error('postprocessing: %s' % str(err))
+ except PostProcessingError as err:
+ self.report_error('Postprocessing: %s' % str(err))
return
try:
for ph in self._post_hooks:
@@ -2467,10 +2467,7 @@ class YoutubeDL(object):
def run_pp(self, pp, infodict, files_to_move={}):
files_to_delete = []
- try:
- files_to_delete, infodict = pp.run(infodict)
- except PostProcessingError as e:
- self.report_error(e.msg)
+ files_to_delete, infodict = pp.run(infodict)
if not files_to_delete:
return files_to_move, infodict