X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fpostprocessor%2Fexecafterdownload.py;h=64dabe790bcb74e88b4959f3c20e0eb23a0bcf8c;hb=a5b6102ea893d6943f9ffa9fc0677229c56c99ca;hp=08419a3d4b6990c83cd0d0c844a61c2abe5c2f0e;hpb=241f7a8adeab76a5cbc9e5a82649b0638a61a328;p=youtube-dl diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dl/postprocessor/execafterdownload.py index 08419a3d4..64dabe790 100644 --- a/youtube_dl/postprocessor/execafterdownload.py +++ b/youtube_dl/postprocessor/execafterdownload.py @@ -3,29 +3,29 @@ from __future__ import unicode_literals import subprocess from .common import PostProcessor +from ..compat import compat_shlex_quote from ..utils import ( - shlex_quote, + encodeArgument, PostProcessingError, ) class ExecAfterDownloadPP(PostProcessor): - def __init__(self, downloader=None, verboseOutput=None, exec_cmd=None): - self.verboseOutput = verboseOutput + def __init__(self, downloader, exec_cmd): + super(ExecAfterDownloadPP, self).__init__(downloader) self.exec_cmd = exec_cmd def run(self, information): cmd = self.exec_cmd - if not '{}' in cmd: + if '{}' not in cmd: cmd += ' {}' - cmd = cmd.replace('{}', shlex_quote(information['filepath'])) + cmd = cmd.replace('{}', compat_shlex_quote(information['filepath'])) - self._downloader.to_screen("[exec] Executing command: %s" % cmd) - retCode = subprocess.call(cmd, shell=True) + self._downloader.to_screen('[exec] Executing command: %s' % cmd) + retCode = subprocess.call(encodeArgument(cmd), shell=True) if retCode != 0: raise PostProcessingError( 'Command returned error code %d' % retCode) - return None, information # by default, keep file and do nothing - + return [], information