[refactor] Single quotes consistency

[youtube-dl] / youtube_dl / postprocessor / execafterdownload.py

diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dl/postprocessor/execafterdownload.py
index e6f3cdfd226b74e56ad75f624a81cfcaef46b166..74f66d669c0679a9eece06b1924ecc9f5dae00d2 100644 (file)
--- a/youtube_dl/postprocessor/execafterdownload.py
+++ b/youtube_dl/postprocessor/execafterdownload.py
@@ -1,39 +1,28 @@
 from __future__ import unicode_literals
+
+import subprocess
+
 from .common import PostProcessor
+from ..compat import shlex_quote
 from ..utils import PostProcessingError
-import subprocess
-import shlex
 
 
 class ExecAfterDownloadPP(PostProcessor):
-    def __init__(self, downloader=None, verboseOutput=None, commandString=None):
-        self.verboseOutput = verboseOutput
-        self.commandString = commandString
+    def __init__(self, downloader, exec_cmd):
+        super(ExecAfterDownloadPP, self).__init__(downloader)
+        self.exec_cmd = exec_cmd
 
     def run(self, information):
-        self.targetFile = information['filepath'].replace('\'', '\'\\\'\'')  # Replace single quotes with '\''
-        self.commandList = shlex.split(self.commandString)
-        self.commandString = ''
-
-        # Replace all instances of '{}' with the file name and convert argument list to single string.
-        for index, arg in enumerate(self.commandList):
-            if(arg == '{}'):
-                self.commandString += '\'' + self.targetFile + '\' '
-            else:
-                self.commandString += arg + ' '
-
-        if self.targetFile not in self.commandString:  # Assume user wants the file appended to the end of the command if no {}'s were given.
-            self.commandString += '\'' + self.targetFile + '\''
-
-        print("[exec] Executing command: " + self.commandString)
-        self.retCode = subprocess.call(self.commandString, shell=True)
-        if(self.retCode < 0):
-            print("[exec] WARNING: Command exited with a negative return code, the process was killed externally. Your command may not of completed succesfully!")
-        elif(self.verboseOutput):
-            print("[exec] Command exited with return code: " + str(self.retCode))
+        cmd = self.exec_cmd
+        if '{}' not in cmd:
+            cmd += ' {}'
 
-        return None, information  # by default, keep file and do nothing
+        cmd = cmd.replace('{}', shlex_quote(information['filepath']))
 
+        self._downloader.to_screen('[exec] Executing command: %s' % cmd)
+        retCode = subprocess.call(cmd, shell=True)
+        if retCode != 0:
+            raise PostProcessingError(
+                'Command returned error code %d' % retCode)
 
-class PostProcessingExecError(PostProcessingError):
-    pass
+        return [], information