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

add option to remove path. fixes #162 fixes #163

Browse source 
thanks @dmccormack
This commit is contained in:
clinton-hall 2013-07-11 22:43:57 +09:30
commit 8248c14887
6 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
autoProcess/autoProcessMovie.py
View file

@ -202,6 +202,11 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
except (ConfigParser.NoOptionError, ValueError):
transcode = 0
try:
remoteCPS = int(config.get("CouchPotato", "remoteCPS"))
except (ConfigParser.NoOptionError, ValueError):
remoteCPS = 0
nzbName = str(nzbName) # make sure it is a string
imdbid = get_imdb(nzbName, dirName)
@ -235,7 +240,10 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
else:
command = "renamer.scan"
if clientAgent != "manual" and download_id != "none":
command = command + "/?movie_folder=" + dirName + "&downloader=" + clientAgent + "&download_id=" + download_id
if remoteCPS == 1:
command = command + "/?downloader=" + clientAgent + "&download_id=" + download_id
else:
command = command + "/?movie_folder=" + dirName + "&downloader=" + clientAgent + "&download_id=" + download_id
url = baseURL + command

4
autoProcess/migratecfg.py
View file

@ -231,8 +231,8 @@ def addnzbget():
confignew.read(configFilenamenew)
section = "CouchPotato"
envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED']
cfgKeys = ['cpsCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed']
envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED', 'REMOTECPS']
cfgKeys = ['cpsCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed', 'remoteCPS']
for index in range(len(envKeys)):
key = 'NZBPO_CPS' + envKeys[index]
if os.environ.has_key(key):

2
autoProcessMedia.cfg.sample
View file

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

12
changelog.txt
View file

@ -1,10 +1,18 @@
Change_LOG / History
VX.X XX/XX/2013
V8.3 11/07/2013
Impacts All
Allow use of experimental AAC codec in transcoder.
Remove username and password when api key is used.
Remove username and password when api key is used.
Add .m4v as media
Added ResetDateTime.py
Manual Opion for Mylar script.
Fixes for Gamez script.
Impacts NZBs
Added option to remove folder path when CouchPotato on different system to downlaoder.
NZBGet v11.0 stable now current.
V8.2 26/05/2013

5
nzbToCouchPotato.py
View file

@ -53,6 +53,11 @@
# set to 1 to delete failed, or 0 to leave files in place.
#cpsdelete_failed=0
# CouchPotatoServer and NZBGet are on same system (0, 1).
#
# set to 1 if CouchPotato and NZBGet are on the same system, or 0 if on teh same system.
#remoteCPS = 0
## Extensions
# Media Extensions

5
nzbToMedia.py
View file

@ -53,6 +53,11 @@
# set to 1 to delete failed, or 0 to leave files in place.
#cpsdelete_failed=0
# CouchPotatoServer and NZBGet are on same system (0, 1).
#
# set to 1 if CouchPotato and NZBGet are on the same system, or 0 if on teh same system.
#remoteCPS = 0
## SickBeard
# SickBeard script category.