Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Exec] Ensure backward compatibility when the command contains `%`

This commit is contained in:
pukkandan 2021-04-16 00:14:33 +05:30
parent 79360d99d3
commit c6ce815461
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
yt_dlp/postprocessor/execafterdownload.py
View File

@ -1,11 +1,13 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re
import subprocess import subprocess
from .common import PostProcessor from .common import PostProcessor
from ..compat import compat_shlex_quote from ..compat import compat_shlex_quote
from ..utils import ( from ..utils import (
encodeArgument, encodeArgument,
FORMAT_RE,
PostProcessingError, PostProcessingError,
) )
@ -20,18 +22,20 @@ class ExecAfterDownloadPP(PostProcessor):
def pp_key(cls): def pp_key(cls):
return 'Exec' return 'Exec'
def run(self, info): def parse_cmd(self, cmd, info):
tmpl, info_copy = self._downloader.prepare_outtmpl(self.exec_cmd, info) # If no %(key)s is found, replace {} for backard compatibility
cmd = tmpl % info_copy if not re.search(FORMAT_RE.format(r'[-\w>.+]+'), cmd):
if cmd == self.exec_cmd: # No replacements were made if '{}' not in cmd:
if '{}' not in self.exec_cmd: cmd += ' {}'
self.exec_cmd += ' {}' return cmd.replace('{}', compat_shlex_quote(info['filepath']))
cmd = self.exec_cmd.replace('{}', compat_shlex_quote(info['filepath']))
tmpl, info_copy = self._downloader.prepare_outtmpl(cmd, info)
return tmpl % info_copy
def run(self, info):
cmd = self.parse_cmd(self.exec_cmd, info)
self.to_screen('Executing command: %s' % cmd) self.to_screen('Executing command: %s' % cmd)
retCode = subprocess.call(encodeArgument(cmd), shell=True) retCode = subprocess.call(encodeArgument(cmd), shell=True)
if retCode != 0: if retCode != 0:
raise PostProcessingError( raise PostProcessingError('Command returned error code %d' % retCode)
'Command returned error code %d' % retCode)
return [], info return [], info