Moved from os.system to subprocess.call
parent
a7cacbca2b
commit
a2360a4c80
Binary file not shown.
@ -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
|
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
|
self.commandString = commandString
|
||||||
|
|
||||||
def set_downloader( self, downloader ):
|
|
||||||
"""Sets the downloader for this PP."""
|
|
||||||
self._downloader = downloader
|
|
||||||
|
|
||||||
def run(self, information):
|
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.
|
|
||||||
self.finalCommand = re.sub( "{}", '\'' + self.targetFile + '\'', 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:
|
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
|
return None, information # by default, keep file and do nothing
|
||||||
|
|
||||||
|
|
||||||
class PostProcessingExecError(PostProcessingError):
|
class PostProcessingExecError(PostProcessingError):
|
||||||
pass
|
pass
|
||||||
|
Loading…
Reference in New Issue