Moved from os.system to subprocess.call

.gitignore

@@ -26,5 +26,6 @@ updates_key.pem
 *.m4a
 *.m4v
 *.part
+*.swp
 test/testdata
 .tox

youtube_dl/__init__.py

@@ -123,7 +123,7 @@ from .postprocessor import (
     FFmpegExtractAudioPP,
     FFmpegEmbedSubtitlePP,
     XAttrMetadataPP,
-    ExecAfterDownload,
+    ExecAfterDownloadPP,
 )
 
 
@@ -865,7 +865,7 @@ def _real_main(argv=None):
         # Please keep ExecAfterDownload towards the bottom as it allows the user to modify the final file in any way.
         # So if the user is able to remove the file before your postprocessor runs it might cause a few problems.
         if opts.execstring:
-            ydl.add_post_processor(ExecAfterDownload(commandString=opts.execstring))
+            ydl.add_post_processor(ExecAfterDownloadPP(verboseOutput=opts.verbose,commandString=opts.execstring))
 
         # Update version
         if opts.update_self:

youtube_dl/postprocessor/__init__.py

@@ -9,7 +9,7 @@ from .ffmpeg import (
     FFmpegEmbedSubtitlePP,
 )
 from .xattrpp import XAttrMetadataPP
-from .execafterdownload import ExecAfterDownload
+from .execafterdownload import ExecAfterDownloadPP
 
 __all__ = [
     'AtomicParsleyPP',
@@ -20,5 +20,5 @@ __all__ = [
     'FFmpegExtractAudioPP',
     'FFmpegEmbedSubtitlePP',
     'XAttrMetadataPP',
-    'ExecAfterDownload',
+    'ExecAfterDownloadPP',
 ]

youtube_dl/postprocessor/execafterdownload.py

@@ -1,36 +1,39 @@
-# ExecAfterDownload written by AaronM / mcd1992.
+from __future__ import unicode_literals
-# If there are any issues with this postprocessor please contact me via github or admin@fgthou.se
+from .common import PostProcessor
-
-import os, re, shlex
 from ..utils import PostProcessingError
+import subprocess
+import shlex
 
-class ExecAfterDownload( object ):
-    _downloader = None
 
-    def __init__( self, downloader = None, commandString = None ):
+class ExecAfterDownloadPP(PostProcessor):
-        self._downloader = downloader
+    def __init__(self, downloader=None, verboseOutput=None, commandString=None):
+        self.verboseOutput = verboseOutput
         self.commandString = commandString
 
-    def set_downloader( self, downloader ):
-        """Sets the downloader for this PP."""
-        self._downloader = downloader
-
     def run(self, information):
-        self.targetFile = information["filepath"]
+        self.targetFile = information['filepath'].replace('\'', '\'\\\'\'')  # Replace single quotes with '\''
-        self.finalCommand = None;
+        self.commandList = shlex.split(self.commandString)
+        self.commandString = ''
 
-        if( re.search( '{}', self.commandString ) ): # Find and replace all occurrences of {} with the file name.
+        # Replace all instances of '{}' with the file name and convert argument list to single string.
-            self.finalCommand = re.sub( "{}", '\'' + self.targetFile + '\'', self.commandString )
+        for index, arg in enumerate(self.commandList):
+            if(arg == '{}'):
+                self.commandString += '\'' + self.targetFile + '\' '
             else:
-            self.finalCommand = self.commandString + ' \'' + self.targetFile + '\''
+                self.commandString += arg + ' '
 
-        if( self.finalCommand ):
+        if self.targetFile not in self.commandString:  # Assume user wants the file appended to the end of the command if no {}'s were given.
-            print( "[exec] Executing command: " + self.finalCommand )
+            self.commandString += '\'' + self.targetFile + '\''
-            os.system( self.finalCommand )
+
-        else:
+        print("[exec] Executing command: " + self.commandString)
-            raise PostProcessingExecError( "Invalid syntax for --exec post processor" )
+        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))
 
         return None, information  # by default, keep file and do nothing
 
+
 class PostProcessingExecError(PostProcessingError):
     pass