github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-22 14:13:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove movie folder location from CP renamer params if CP server is running on a different server than the NZB CLient. #162

Browse source
This commit is contained in:
Declan McCormack 2013-07-10 10:07:58 +02:00
commit a8d65c55a2
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
autoProcess/autoProcessMovie.py
View file

@ -222,6 +222,11 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
transcode = 0 transcode = 0
try:
remoteCPS = int(config.get("CouchPotato", "remoteCPS"))
except (ConfigParser.NoOptionError, ValueError):
remoteCPS = 0
myOpener = AuthURLOpener(username, password) myOpener = AuthURLOpener(username, password)
nzbName = str(nzbName) # make sure it is a string nzbName = str(nzbName) # make sure it is a string
@ -257,6 +262,9 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
else: else:
command = "renamer.scan" command = "renamer.scan"
if clientAgent != "manual" and download_id != "none": if clientAgent != "manual" and download_id != "none":
if remoteCPS == 1:
command = command + "/?downloader=" + clientAgent + "&download_id=" + download_id
else:
command = command + "/?movie_folder=" + dirName + "&downloader=" + clientAgent + "&download_id=" + download_id command = command + "/?movie_folder=" + dirName + "&downloader=" + clientAgent + "&download_id=" + download_id
url = baseURL + command url = baseURL + command

2
autoProcessMedia.cfg.sample
View file

@ -17,6 +17,8 @@ delay = 65
method = renamer method = renamer
delete_failed = 0 delete_failed = 0
wait_for = 2 wait_for = 2
#### Set to 1 if CouchPotatoServer is running on a different server to your NZB client
remoteCPS = 0
[SickBeard] [SickBeard]