diff --git a/mylar/PostProcessor.py b/mylar/PostProcessor.py index 7d2997b8..a3cde425 100755 --- a/mylar/PostProcessor.py +++ b/mylar/PostProcessor.py @@ -83,7 +83,7 @@ class PostProcessor(object): # logger.log(message, level) self.log += message + '\n' - def _run_pre_scripts(self, nzb_name, nzb_folder, filen, folderp, seriesmetadata): + def _run_pre_scripts(self, nzb_name, nzb_folder ): """ Executes any pre scripts defined in the config. @@ -95,7 +95,7 @@ class PostProcessor(object): currentScriptName = mylar.PRE_SCRIPTS self._log("pre script detected...enabling: " + str(currentScriptName), logger.DEBUG) # generate a safe command line string to execute the script and provide all the parameters - script_cmd = shlex.split(currentScriptName) + [str(nzb_name), str(nzb_folder), str(filen), str(folderp), str(seriesmetadata)] + script_cmd = shlex.split(currentScriptName) + [str(nzb_name), str(nzb_folder)] self._log("cmd to be executed: " + str(script_cmd), logger.DEBUG) # use subprocess to run the command and capture output @@ -264,6 +264,7 @@ class PostProcessor(object): if mylar.ENABLE_PRE_SCRIPTS: nzbn = self.nzb_name #original nzb name + nzbf = self.nzb_folder #original nzb folder #name, comicyear, comicid , issueid, issueyear, issue, publisher #create the dic and send it. seriesmeta = [] @@ -278,7 +279,7 @@ class PostProcessor(object): 'publisher': publisher }) seriesmetadata['seriesmeta'] = seriesmeta - self._run_pre_scripts(nzbn, self.nzb_folder, seriesmetadata ) + self._run_pre_scripts(nzbn, nzbf ) #rename file and move to new path #nfilename = series + " " + issueno + " (" + seriesyear + ")"