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

cleanup and a few fixes. #288

Browse source
This commit is contained in:
clinton-hall 2014-03-21 21:55:00 +10:30
commit a9556dd7a0
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TorrentToMedia.py
View file

@ -21,7 +21,7 @@ import autoProcess.autoProcessMovie as autoProcessMovie
import autoProcess.autoProcessTV as autoProcessTV import autoProcess.autoProcessTV as autoProcessTV
from autoProcess.nzbToMediaEnv import * from autoProcess.nzbToMediaEnv import *
from autoProcess.nzbToMediaUtil import * from autoProcess.nzbToMediaUtil import *
from autoSickBeardFork import autoFork from autoProcess.autoSickBeardFork import autoFork
from utorrent.client import UTorrentClient from utorrent.client import UTorrentClient
from transmissionrpc.client import Client as TransmissionClient from transmissionrpc.client import Client as TransmissionClient
from synchronousdeluge.client import DelugeClient from synchronousdeluge.client import DelugeClient
@ -44,6 +44,8 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
Logger.debug("MAIN: Determined Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory) Logger.debug("MAIN: Determined Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory)
sbFork, sbParams = autoFork()
if inputCategory in sbCategory and sbFork in SICKBEARD_TORRENT and Torrent_ForceLink != 1: if inputCategory in sbCategory and sbFork in SICKBEARD_TORRENT and Torrent_ForceLink != 1:
Logger.info("MAIN: Calling SickBeard's %s branch to post-process: %s",sbFork ,inputName) Logger.info("MAIN: Calling SickBeard's %s branch to post-process: %s",sbFork ,inputName)
result = autoProcessTV.processEpisode(inputDirectory, inputName, int(0)) result = autoProcessTV.processEpisode(inputDirectory, inputName, int(0))
@ -490,7 +492,6 @@ if __name__ == "__main__":
cpsCategory = (config.get("CouchPotato", "cpsCategory")).split(',') # movie cpsCategory = (config.get("CouchPotato", "cpsCategory")).split(',') # movie
sbCategory = (config.get("SickBeard", "sbCategory")).split(',') # tv sbCategory = (config.get("SickBeard", "sbCategory")).split(',') # tv
sbFork, sbParams = autoFork(config.get("SickBeard", "fork")) # default
Torrent_ForceLink = int(config.get("SickBeard", "Torrent_ForceLink")) # 1 Torrent_ForceLink = int(config.get("SickBeard", "Torrent_ForceLink")) # 1
hpCategory = (config.get("HeadPhones", "hpCategory")).split(',') # music hpCategory = (config.get("HeadPhones", "hpCategory")).split(',') # music
mlCategory = (config.get("Mylar", "mlCategory")).split(',') # comics mlCategory = (config.get("Mylar", "mlCategory")).split(',') # comics

6
autoSickBeardFork.py → autoProcess/autoSickBeardFork.py
View file

@ -51,10 +51,10 @@ def autoFork(fork=None):
try: try:
fork = config.get(section, "fork") fork = config.get(section, "fork")
if not fork in "auto": if not fork in "auto":
fork = forks[fork] \ fork = fork if fork in SICKBEARD_FAILED or fork in SICKBEARD_TORRENT else fork_default
if fork in SICKBEARD_FAILED or SICKBEARD_TORRENT else forks[fork_default] fork = [f for f in forks.iteritems() if f[0] == fork][0]
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
fork = forks[fork_default] fork = [f for f in forks.iteritems() if f[0] == fork_default][0]
myOpener = AuthURLOpener(username, password) myOpener = AuthURLOpener(username, password)

2
autoProcess/migratecfg.py
View file

@ -61,6 +61,8 @@ def migrate():
if option == "failed_fork": # change this old format if option == "failed_fork": # change this old format
option = "fork" option = "fork"
value = "auto" value = "auto"
if option == "fork" and value in ["TPB", "TPB-failed", "Pistachitos"]: # Merge all these to "auto"
value = "auto"
if option == "outputDirectory": # move this to new location format if option == "outputDirectory": # move this to new location format
value = os.path.split(os.path.normpath(value))[0] value = os.path.split(os.path.normpath(value))[0]
confignew.set("Torrent", option, value) confignew.set("Torrent", option, value)

2
nzbToMedia.py
View file

@ -109,7 +109,7 @@
# SickBeard fork. # SickBeard fork.
# #
# set to default or auto to auto-detect the custom failed fork type". # set to default or auto to auto-detect the custom fork type.
#sbfork=auto #sbfork=auto
# SickBeard Delete Failed Downloads (0, 1) # SickBeard Delete Failed Downloads (0, 1)

4
nzbToSickBeard.py
View file

@ -58,8 +58,8 @@
# SickBeard fork. # SickBeard fork.
# #
# set to default or TPB or failed if using the custom "TPB" or "failed fork". # set to default or auto to auto-detect the custom fork type.
#sbfork=default #sbfork=auto
# SickBeard Delete Failed Downloads (0, 1). # SickBeard Delete Failed Downloads (0, 1).
# #