mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-14 02:26:53 -07:00
nzbTo* files will now send section variable to nzbToMedia script so that manually processing doesn't bother with trying to post-process unrequired folders, also I've changed the way we call nzbToMedia so this should resolve issue #328 encoding issues.
Custom userscripts folder added to avoid auto-update conflicts so long as the custom scripts are stored in said folder, this folder is added to .gitignore
This commit is contained in:
parent
94354bb7d9
commit
eac9619dcb
12 changed files with 47 additions and 70 deletions
|
@ -323,7 +323,7 @@ def external_script(outputDestination, torrentName, torrentLabel):
|
|||
logger.postprocess("%s files were processed, but %s still remain. outputDirectory will not be cleaned.", num_files, num_files_new)
|
||||
return final_result
|
||||
|
||||
def main():
|
||||
def main(args):
|
||||
# Initialize the config
|
||||
nzbtomedia.initialize()
|
||||
|
||||
|
@ -332,7 +332,7 @@ def main():
|
|||
logger.postprocess("#########################################################")
|
||||
|
||||
# debug command line options
|
||||
logger.debug("Options passed into TorrentToMedia: " + str(sys.argv))
|
||||
logger.debug("Options passed into TorrentToMedia: " + str(args))
|
||||
|
||||
# Post-Processing Result
|
||||
result = 0
|
||||
|
@ -341,7 +341,7 @@ def main():
|
|||
clientAgent = nzbtomedia.CLIENTAGENT
|
||||
|
||||
try:
|
||||
inputDirectory, inputName, inputCategory, inputHash, inputID = parse_args(clientAgent)
|
||||
inputDirectory, inputName, inputCategory, inputHash, inputID = parse_args(clientAgent, args)
|
||||
except:
|
||||
logger.error("There was a problem loading variables")
|
||||
return -1
|
||||
|
@ -366,7 +366,7 @@ def main():
|
|||
result = processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID, clientAgent)
|
||||
|
||||
logger.postprocess("All done.")
|
||||
return result
|
||||
sys.exit(result)
|
||||
|
||||
if __name__ == "__main__":
|
||||
exit(main())
|
||||
main(sys.argv)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue