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

Fixed it so autoProcessMovie returns success if clientAgent is not a torrent client when download_id is empty

Browse source
This commit is contained in:
echel0n 2014-04-07 11:09:42 -07:00
commit 939cc3235b
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nzbToCouchPotato.py
View file

@ -198,6 +198,7 @@ if os.environ.has_key('NZBOP_SCRIPTDIR') and not os.environ['NZBOP_VERSION'][0:5
# All checks done, now launching the script. # All checks done, now launching the script.
download_id = "" download_id = ""
if os.environ.has_key('NZBPR_COUCHPOTATO'): download_id = os.environ['NZBPR_COUCHPOTATO'] if os.environ.has_key('NZBPR_COUCHPOTATO'): download_id = os.environ['NZBPR_COUCHPOTATO']
Logger.info("MAIN: Script triggered from NZBGet, starting autoProcessMovie...") Logger.info("MAIN: Script triggered from NZBGet, starting autoProcessMovie...")
result = autoProcessMovie().process(os.environ['NZBPP_DIRECTORY'], os.environ['NZBPP_NZBFILENAME'], clientAgent="nzbget", inputCategory=os.environ['NZBPP_CATEGORY']) result = autoProcessMovie().process(os.environ['NZBPP_DIRECTORY'], os.environ['NZBPP_NZBFILENAME'], clientAgent="nzbget", inputCategory=os.environ['NZBPP_CATEGORY'])

4
nzbtomedia/autoProcess/autoProcessMovie.py
View file

@ -214,6 +214,7 @@ class autoProcessMovie:
protocol = "https://" protocol = "https://"
else: else:
protocol = "http://" protocol = "http://"
# don't delay when we are calling this script manually. # don't delay when we are calling this script manually.
if clientAgent == "manual": if clientAgent == "manual":
delay = 0 delay = 0
@ -304,7 +305,10 @@ class autoProcessMovie:
if clientAgent == "manual": if clientAgent == "manual":
return 0 # success return 0 # success
if not download_id: if not download_id:
if clientAgent in ['utorrent', 'transmission', 'deluge'] :
return 1 # just to be sure TorrentToMedia doesn't start deleting files as we havent verified changed status. return 1 # just to be sure TorrentToMedia doesn't start deleting files as we havent verified changed status.
else:
return 0
# we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing. # we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing.
socket.setdefaulttimeout(int(config.NZBTOMEDIA_TIMEOUT)) #initialize socket timeout. socket.setdefaulttimeout(int(config.NZBTOMEDIA_TIMEOUT)) #initialize socket timeout.