Printing inside `finally` causes the order of logging to change
when there is an error, which is undesirable. So this is reverted.

The issue of `--print` being blocked by pre-processors was an
unintentional side-effect of changing the operation orders in
170605840e, and this is also partially
reverted.
This commit is contained in:
pukkandan 2023-04-29 02:57:50 +05:30
parent f005a35aa7
commit 17ba4343cf
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39

View File

@ -3488,13 +3488,11 @@ def run_pp(self, pp, infodict):
*files_to_delete, info=infodict, msg='Deleting original file %s (pass -k to keep)')
return infodict
def run_all_pps(self, key, info, *, additional_pps=None):
try:
for pp in (additional_pps or []) + self._pps[key]:
info = self.run_pp(pp, info)
finally:
if key != 'video':
self._forceprint(key, info)
def run_all_pps(self, key, info, *, additional_pps=None, fatal=True):
if key != 'video':
self._forceprint(key, info)
for pp in (additional_pps or []) + self._pps[key]:
info = self.run_pp(pp, info)
return info
def pre_process(self, ie_info, key='pre_process', files_to_move=None):