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

add category centric processing. fixes #230

Browse source
This commit is contained in:
clinton-hall 2014-01-07 21:22:47 +10:30
parent c98604c618
commit 6fe287df0d
8 changed files with 135 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

67
TorrentToMedia.py
View file

@ -9,7 +9,6 @@ import logging
import datetime import datetime
import time import time
import re import re
from sets import Set
from subprocess import call, Popen from subprocess import call, Popen
# Custom imports # Custom imports
@ -37,7 +36,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
copy_list = [] copy_list = []
Logger.debug("MAIN: Received Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory) Logger.debug("MAIN: Received Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory)
if inputCategory == sbCategory and sbFork in SICKBEARD_TORRENT: if inputCategory in sbCategory and sbFork in SICKBEARD_TORRENT:
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))
if result == 1: if result == 1:
@ -71,7 +70,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
outputDestination = os.path.normpath(os.path.join(outputDirectory, inputCategory, os.path.splitext(safeName(inputName))[0])) outputDestination = os.path.normpath(os.path.join(outputDirectory, inputCategory, os.path.splitext(safeName(inputName))[0]))
Logger.info("MAIN: Output directory set to: %s", outputDestination) Logger.info("MAIN: Output directory set to: %s", outputDestination)
processOnly = [cpsCategory, sbCategory, hpCategory, mlCategory, gzCategory] processOnly = cpsCategory + sbCategory + hpCategory + mlCategory + gzCategory
if not "NONE" in user_script_categories: # if None, we only process the 5 listed. if not "NONE" in user_script_categories: # if None, we only process the 5 listed.
if "ALL" in user_script_categories: # All defined categories if "ALL" in user_script_categories: # All defined categories
processOnly = categories processOnly = categories
@ -139,7 +138,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
continue # This file has not been recently moved or created, skip it continue # This file has not been recently moved or created, skip it
if fileExtension in mediaContainer: # If the file is a video file if fileExtension in mediaContainer: # If the file is a video file
if is_sample(filePath, inputName, minSampleSize) and not inputCategory == hpCategory: # Ignore samples if is_sample(filePath, inputName, minSampleSize) and not inputCategory in hpCategory: # Ignore samples
Logger.info("MAIN: Ignoring sample file: %s ", filePath) Logger.info("MAIN: Ignoring sample file: %s ", filePath)
continue continue
else: else:
@ -159,7 +158,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
Logger.exception("MAIN: Failed to link file: %s", file) Logger.exception("MAIN: Failed to link file: %s", file)
continue continue
elif fileExtension in compressedContainer: elif fileExtension in compressedContainer:
if inputCategory in [hpCategory]: # We need to link all files for HP in order to move these back to support seeding. if inputCategory in hpCategory: # We need to link all files for HP in order to move these back to support seeding.
Logger.info("MAIN: Linking compressed archive file %s for file %s", fileExtension, filePath) Logger.info("MAIN: Linking compressed archive file %s for file %s", fileExtension, filePath)
try: try:
copy_link(filePath, targetDirectory, useLink, outputDestination) copy_link(filePath, targetDirectory, useLink, outputDestination)
@ -176,7 +175,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
continue continue
Logger.info("MAIN: Found compressed archive %s for file %s", fileExtension, filePath) Logger.info("MAIN: Found compressed archive %s for file %s", fileExtension, filePath)
try: try:
if inputCategory == hpCategory: # HP needs to scan the same dir as passed to downloader. if inputCategory in hpCategory: # HP needs to scan the same dir as passed to downloader.
extractor.extract(filePath, inputDirectory) extractor.extract(filePath, inputDirectory)
else: else:
extractor.extract(filePath, outputDestination) extractor.extract(filePath, outputDestination)
@ -185,7 +184,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
except: except:
Logger.exception("MAIN: Extraction failed for: %s", file) Logger.exception("MAIN: Extraction failed for: %s", file)
continue continue
elif not inputCategory in [cpsCategory, sbCategory]: #process all for non-video categories. elif (not inputCategory in cpsCategory) and (not inputCategory in sbCategory): #process all for non-video categories.
Logger.info("MAIN: Found file %s for category %s", filePath, inputCategory) Logger.info("MAIN: Found file %s for category %s", filePath, inputCategory)
copy_link(filePath, targetDirectory, useLink, outputDestination) copy_link(filePath, targetDirectory, useLink, outputDestination)
copy_list.append([filePath, os.path.join(outputDestination, file)]) copy_list.append([filePath, os.path.join(outputDestination, file)])
@ -193,11 +192,11 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
else: else:
Logger.debug("MAIN: Ignoring unknown filetype %s for file %s", fileExtension, filePath) Logger.debug("MAIN: Ignoring unknown filetype %s for file %s", fileExtension, filePath)
continue continue
if not inputCategory in [hpCategory]: #don't flatten hp in case multi cd albums, and we need to copy this back later. if not inputCategory in hpCategory: #don't flatten hp in case multi cd albums, and we need to copy this back later.
flatten(outputDestination) flatten(outputDestination)
# Now check if movie files exist in destination: # Now check if movie files exist in destination:
if inputCategory in [cpsCategory, sbCategory]: if inputCategory in cpsCategory + sbCategory:
for dirpath, dirnames, filenames in os.walk(outputDestination): for dirpath, dirnames, filenames in os.walk(outputDestination):
for file in filenames: for file in filenames:
filePath = os.path.join(dirpath, file) filePath = os.path.join(dirpath, file)
@ -217,39 +216,39 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
else: else:
Logger.debug("MAIN: Found %s media files in output. %s were found in input", str(video2), str(video)) Logger.debug("MAIN: Found %s media files in output. %s were found in input", str(video2), str(video))
processCategories = Set([cpsCategory, sbCategory, hpCategory, mlCategory, gzCategory]) processCategories = cpsCategory + sbCategory + hpCategory + mlCategory + gzCategory
if (inputCategory in user_script_categories and not "NONE" in user_script_categories) or ("ALL" in user_script_categories and not inputCategory in processCategories): if (inputCategory in user_script_categories and not "NONE" in user_script_categories) or ("ALL" in user_script_categories and not inputCategory in processCategories):
Logger.info("MAIN: Processing user script %s.", user_script) Logger.info("MAIN: Processing user script %s.", user_script)
result = external_script(outputDestination) result = external_script(outputDestination)
elif status == int(0) or (inputCategory in [hpCategory, mlCategory, gzCategory]): # if movies linked/extracted or for other categories. elif status == int(0) or (inputCategory in hpCategory + mlCategory + gzCategory): # if movies linked/extracted or for other categories.
Logger.debug("MAIN: Calling autoProcess script for successful download.") Logger.debug("MAIN: Calling autoProcess script for successful download.")
status = int(0) # hp, my, gz don't support failed. status = int(0) # hp, my, gz don't support failed.
else: else:
Logger.error("MAIN: Something failed! Please check logs. Exiting") Logger.error("MAIN: Something failed! Please check logs. Exiting")
sys.exit(-1) sys.exit(-1)
if inputCategory == cpsCategory: if inputCategory in cpsCategory:
Logger.info("MAIN: Calling CouchPotatoServer to post-process: %s", inputName) Logger.info("MAIN: Calling CouchPotatoServer to post-process: %s", inputName)
download_id = inputHash download_id = inputHash
result = autoProcessMovie.process(outputDestination, inputName, status, clientAgent, download_id) result = autoProcessMovie.process(outputDestination, inputName, status, clientAgent, download_id, inputCategory)
elif inputCategory == sbCategory: elif inputCategory in sbCategory:
Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName) Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName)
result = autoProcessTV.processEpisode(outputDestination, inputName, status) result = autoProcessTV.processEpisode(outputDestination, inputName, status, inputCategory)
elif inputCategory == hpCategory: elif inputCategory in hpCategory:
Logger.info("MAIN: Calling HeadPhones to post-process: %s", inputName) Logger.info("MAIN: Calling HeadPhones to post-process: %s", inputName)
result = autoProcessMusic.process(inputDirectory, inputName, status) result = autoProcessMusic.process(inputDirectory, inputName, status, inputCategory)
elif inputCategory == mlCategory: elif inputCategory in mlCategory:
Logger.info("MAIN: Calling Mylar to post-process: %s", inputName) Logger.info("MAIN: Calling Mylar to post-process: %s", inputName)
result = autoProcessComics.processEpisode(outputDestination, inputName, status) result = autoProcessComics.processEpisode(outputDestination, inputName, status, inputCategory)
elif inputCategory == gzCategory: elif inputCategory in gzCategory:
Logger.info("MAIN: Calling Gamez to post-process: %s", inputName) Logger.info("MAIN: Calling Gamez to post-process: %s", inputName)
result = autoProcessGames.process(outputDestination, inputName, status) result = autoProcessGames.process(outputDestination, inputName, status, inputCategory)
if result == 1: if result == 1:
Logger.info("MAIN: A problem was reported in the autoProcess* script. If torrent was paused we will resume seeding") Logger.info("MAIN: A problem was reported in the autoProcess* script. If torrent was paused we will resume seeding")
if inputCategory == hpCategory: if inputCategory in hpCategory:
# we need to move the output dir files back... # we need to move the output dir files back...
Logger.debug("MAIN: Moving temporary HeadPhones files back to allow seeding.") Logger.debug("MAIN: Moving temporary HeadPhones files back to allow seeding.")
for item in copy_list: for item in copy_list:
@ -270,10 +269,10 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
Logger.debug("MAIN: Deleting torrent %s from %s", inputName, clientAgent) Logger.debug("MAIN: Deleting torrent %s from %s", inputName, clientAgent)
if clientAgent == 'utorrent' and utorrentClass != "": if clientAgent == 'utorrent' and utorrentClass != "":
utorrentClass.removedata(inputHash) utorrentClass.removedata(inputHash)
if not inputCategory == hpCategory: if not inputCategory in hpCategory:
utorrentClass.remove(inputHash) utorrentClass.remove(inputHash)
if clientAgent == 'transmission' and TransmissionClass !="": if clientAgent == 'transmission' and TransmissionClass !="":
if inputCategory == hpCategory: #don't delete actual files for hp category, just remove torrent. if inputCategory in hpCategory: #don't delete actual files for hp category, just remove torrent.
TransmissionClass.remove_torrent(inputID, False) TransmissionClass.remove_torrent(inputID, False)
else: else:
TransmissionClass.remove_torrent(inputID, True) TransmissionClass.remove_torrent(inputID, True)
@ -412,17 +411,17 @@ if __name__ == "__main__":
metaContainer = (config.get("Extensions", "metaExtensions")).split(',') # .nfo,.sub,.srt metaContainer = (config.get("Extensions", "metaExtensions")).split(',') # .nfo,.sub,.srt
minSampleSize = int(config.get("Extensions", "minSampleSize")) # 200 (in MB) minSampleSize = int(config.get("Extensions", "minSampleSize")) # 200 (in MB)
cpsCategory = config.get("CouchPotato", "cpsCategory") # movie cpsCategory = (config.get("CouchPotato", "cpsCategory")).split(',') # movie
sbCategory = config.get("SickBeard", "sbCategory") # tv sbCategory = (config.get("SickBeard", "sbCategory")).split(',') # tv
sbFork = config.get("SickBeard", "fork") # tv sbFork = config.get("SickBeard", "fork") # tv
hpCategory = config.get("HeadPhones", "hpCategory") # music hpCategory = (config.get("HeadPhones", "hpCategory")).split(',') # music
mlCategory = config.get("Mylar", "mlCategory") # comics mlCategory = (config.get("Mylar", "mlCategory")).split(',') # comics
gzCategory = config.get("Gamez", "gzCategory") # games gzCategory = (config.get("Gamez", "gzCategory")).split(',') # games
categories.append(cpsCategory) categories.extend(cpsCategory)
categories.append(sbCategory) categories.extend(sbCategory)
categories.append(hpCategory) categories.extend(hpCategory)
categories.append(mlCategory) categories.extend(mlCategory)
categories.append(gzCategory) categories.extend(gzCategory)
user_script_categories = config.get("UserScript", "user_script_categories").split(',') # NONE user_script_categories = config.get("UserScript", "user_script_categories").split(',') # NONE
if not "NONE" in user_script_categories: if not "NONE" in user_script_categories:

19
autoProcess/autoProcessComics.py
View file

@ -30,7 +30,7 @@ class AuthURLOpener(urllib.FancyURLopener):
return urllib.FancyURLopener.open(self, url) return urllib.FancyURLopener.open(self, url)
def processEpisode(dirName, nzbName=None, status=0): def processEpisode(dirName, nzbName=None, status=0, inputCategory=None):
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg") configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
@ -42,22 +42,25 @@ def processEpisode(dirName, nzbName=None, status=0):
config.read(configFilename) config.read(configFilename)
host = config.get("Mylar", "host") section = "Mylar"
port = config.get("Mylar", "port") if inputCategory != None and config.has_section(inputCategory):
username = config.get("Mylar", "username") section = inputCategory
password = config.get("Mylar", "password") host = config.get(section, "host")
port = config.get(section, "port")
username = config.get(section, "username")
password = config.get(section, "password")
try: try:
ssl = int(config.get("Mylar", "ssl")) ssl = int(config.get(section, "ssl"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
ssl = 0 ssl = 0
try: try:
web_root = config.get("Mylar", "web_root") web_root = config.get(section, "web_root")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
web_root = "" web_root = ""
try: try:
watch_dir = config.get("Mylar", "watch_dir") watch_dir = config.get(section, "watch_dir")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
watch_dir = "" watch_dir = ""
params = {} params = {}

16
autoProcess/autoProcessGames.py
View file

@ -13,7 +13,7 @@ from nzbToMediaUtil import *
Logger = logging.getLogger() Logger = logging.getLogger()
def process(dirName, nzbName=None, status=0): def process(dirName, nzbName=None, status=0, inputCategory=None):
status = int(status) status = int(status)
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
@ -26,17 +26,21 @@ def process(dirName, nzbName=None, status=0):
config.read(configFilename) config.read(configFilename)
host = config.get("Gamez", "host") section = "Gamez"
port = config.get("Gamez", "port") if inputCategory != None and config.has_section(inputCategory):
apikey = config.get("Gamez", "apikey") section = inputCategory
host = config.get(section, "host")
port = config.get(section, "port")
apikey = config.get(section, "apikey")
try: try:
ssl = int(config.get("Gamez", "ssl")) ssl = int(config.get(section, "ssl"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
ssl = 0 ssl = 0
try: try:
web_root = config.get("Gamez", "web_root") web_root = config.get(section, "web_root")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
web_root = "" web_root = ""

26
autoProcess/autoProcessMovie.py
View file

@ -190,7 +190,7 @@ def get_status(baseURL, movie_id, clientAgent, download_id):
download_id = "none" download_id = "none"
return movie_status, clientAgent, download_id, release_status return movie_status, clientAgent, download_id, release_status
def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id = ""): def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id = "", inputCategory=None):
status = int(status) status = int(status)
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
@ -203,21 +203,25 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
config.read(configFilename) config.read(configFilename)
host = config.get("CouchPotato", "host") section = "CouchPotato"
port = config.get("CouchPotato", "port") if inputCategory != None and config.has_section(inputCategory):
apikey = config.get("CouchPotato", "apikey") section = inputCategory
delay = float(config.get("CouchPotato", "delay"))
method = config.get("CouchPotato", "method") host = config.get(section., "host")
delete_failed = int(config.get("CouchPotato", "delete_failed")) port = config.get(section., "port")
wait_for = int(config.get("CouchPotato", "wait_for")) apikey = config.get(section., "apikey")
delay = float(config.get(section., "delay"))
method = config.get(section., "method")
delete_failed = int(config.get(section., "delete_failed"))
wait_for = int(config.get(section., "wait_for"))
try: try:
ssl = int(config.get("CouchPotato", "ssl")) ssl = int(config.get(section., "ssl"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
ssl = 0 ssl = 0
try: try:
web_root = config.get("CouchPotato", "web_root") web_root = config.get(section., "web_root")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
web_root = "" web_root = ""
@ -227,7 +231,7 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
transcode = 0 transcode = 0
try: try:
remoteCPS = int(config.get("CouchPotato", "remoteCPS")) remoteCPS = int(config.get(section., "remoteCPS"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
remoteCPS = 0 remoteCPS = 0

18
autoProcess/autoProcessMusic.py
View file

@ -13,7 +13,7 @@ from nzbToMediaUtil import *
Logger = logging.getLogger() Logger = logging.getLogger()
def process(dirName, nzbName=None, status=0): def process(dirName, nzbName=None, status=0, inputCategory=None):
status = int(status) status = int(status)
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
@ -26,18 +26,22 @@ def process(dirName, nzbName=None, status=0):
config.read(configFilename) config.read(configFilename)
host = config.get("HeadPhones", "host") section = "HeadPhones"
port = config.get("HeadPhones", "port") if inputCategory != None and config.has_section(inputCategory):
apikey = config.get("HeadPhones", "apikey") section = inputCategory
delay = float(config.get("HeadPhones", "delay"))
host = config.get(section., "host")
port = config.get(section., "port")
apikey = config.get(section., "apikey")
delay = float(config.get(section., "delay"))
try: try:
ssl = int(config.get("HeadPhones", "ssl")) ssl = int(config.get(section., "ssl"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
ssl = 0 ssl = 0
try: try:
web_root = config.get("HeadPhones", "web_root") web_root = config.get(section., "web_root")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
web_root = "" web_root = ""

26
autoProcess/autoProcessTV.py
View file

@ -41,7 +41,7 @@ def delete(dirName):
Logger.exception("Unable to delete folder %s", dirName) Logger.exception("Unable to delete folder %s", dirName)
def processEpisode(dirName, nzbName=None, failed=False): def processEpisode(dirName, nzbName=None, failed=False, inputCategory=None):
status = int(failed) status = int(failed)
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
@ -54,28 +54,32 @@ def processEpisode(dirName, nzbName=None, failed=False):
config.read(configFilename) config.read(configFilename)
section = "SickBeard"
if inputCategory != None and config.has_section(inputCategory):
section = inputCategory
watch_dir = "" watch_dir = ""
host = config.get("SickBeard", "host") host = config.get(section., "host")
port = config.get("SickBeard", "port") port = config.get(section., "port")
username = config.get("SickBeard", "username") username = config.get(section., "username")
password = config.get("SickBeard", "password") password = config.get(section., "password")
try: try:
ssl = int(config.get("SickBeard", "ssl")) ssl = int(config.get(section., "ssl"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
ssl = 0 ssl = 0
try: try:
web_root = config.get("SickBeard", "web_root") web_root = config.get(section., "web_root")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
web_root = "" web_root = ""
try: try:
watch_dir = config.get("SickBeard", "watch_dir") watch_dir = config.get(section., "watch_dir")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
watch_dir = "" watch_dir = ""
try: try:
fork = config.get("SickBeard", "fork") fork = config.get(section., "fork")
except ConfigParser.NoOptionError: except ConfigParser.NoOptionError:
fork = "default" fork = "default"
@ -85,11 +89,11 @@ def processEpisode(dirName, nzbName=None, failed=False):
transcode = 0 transcode = 0
try: try:
delete_failed = int(config.get("SickBeard", "delete_failed")) delete_failed = int(config.get(section., "delete_failed"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
delete_failed = 0 delete_failed = 0
try: try:
delay = float(config.get("SickBeard", "delay")) delay = float(config.get(section., "delay"))
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
delay = 0 delay = 0

22
autoProcess/migratecfg.py
View file

@ -12,6 +12,8 @@ def migrate():
configold = ConfigParser.ConfigParser() configold = ConfigParser.ConfigParser()
configold.optionxform = str configold.optionxform = str
categories = []
section = "CouchPotato" section = "CouchPotato"
original = [] original = []
configFilenameold = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg") configFilenameold = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
@ -35,6 +37,8 @@ def migrate():
continue continue
if option in ["username", "password" ]: # these are no-longer needed. if option in ["username", "password" ]: # these are no-longer needed.
continue continue
if option == "cpsCategory":
categories.extend(value.split(','))
confignew.set(section, option, value) confignew.set(section, option, value)
section = "SickBeard" section = "SickBeard"
@ -64,6 +68,8 @@ def migrate():
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)
continue continue
if option == "sbCategory":
categories.extend(value.split(','))
confignew.set(section, option, value) confignew.set(section, option, value)
section = "HeadPhones" section = "HeadPhones"
@ -79,6 +85,8 @@ def migrate():
if option in ["username", "password" ]: # these are no-longer needed. if option in ["username", "password" ]: # these are no-longer needed.
continue continue
option, value = item option, value = item
if option == "hpCategory":
categories.extend(value.split(','))
confignew.set(section, option, value) confignew.set(section, option, value)
section = "Mylar" section = "Mylar"
@ -89,6 +97,8 @@ def migrate():
pass pass
for item in original: for item in original:
option, value = item option, value = item
if option == "mlCategory":
categories.extend(value.split(','))
confignew.set(section, option, value) confignew.set(section, option, value)
section = "Gamez" section = "Gamez"
@ -98,8 +108,20 @@ def migrate():
except: except:
pass pass
for item in original: for item in original:
option, value = item
if option in ["username", "password" ]: # these are no-longer needed. if option in ["username", "password" ]: # these are no-longer needed.
continue continue
if option == "gzCategory":
categories.extend(value.split(','))
confignew.set(section, option, value)
for section in categories:
original = []
try:
original = configold.items(section)
except:
continue
for item in original:
option, value = item option, value = item
confignew.set(section, option, value) confignew.set(section, option, value)

32
nzbToMedia.py
View file

@ -279,11 +279,11 @@ if not os.path.isfile(configFilename):
Logger.info("MAIN: Loading config from %s", configFilename) Logger.info("MAIN: Loading config from %s", configFilename)
config.read(configFilename) config.read(configFilename)
cpsCategory = config.get("CouchPotato", "cpsCategory") # movie cpsCategory = (config.get("CouchPotato", "cpsCategory")).split(',') # movie
sbCategory = config.get("SickBeard", "sbCategory") # tv sbCategory = (config.get("SickBeard", "sbCategory")).split(',') # tv
hpCategory = config.get("HeadPhones", "hpCategory") # music hpCategory = (config.get("HeadPhones", "hpCategory")).split(',') # music
mlCategory = config.get("Mylar", "mlCategory") # comics mlCategory = (config.get("Mylar", "mlCategory")).split(',') # comics
gzCategory = config.get("Gamez", "gzCategory") # games gzCategory = (config.get("Gamez", "gzCategory")).split(',') # games
# NZBGet V11+ # NZBGet V11+
# Check if the script is called from nzbget 11.0 or later # Check if the script is called from nzbget 11.0 or later
@ -386,23 +386,23 @@ else: # only CPS supports this manual run for now.
clientAgent = "manual" clientAgent = "manual"
nzbDir, inputName, status, inputCategory, download_id = ('Manual Run', 'Manual Run', 0, cpsCategory, '') nzbDir, inputName, status, inputCategory, download_id = ('Manual Run', 'Manual Run', 0, cpsCategory, '')
if inputCategory == cpsCategory: if inputCategory in cpsCategory:
Logger.info("MAIN: Calling CouchPotatoServer to post-process: %s", inputName) Logger.info("MAIN: Calling CouchPotatoServer to post-process: %s", inputName)
result = autoProcessMovie.process(nzbDir, inputName, status, clientAgent, download_id) result = autoProcessMovie.process(nzbDir, inputName, status, clientAgent, download_id, inputCategory)
elif inputCategory == sbCategory: elif inputCategory in sbCategory:
Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName) Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName)
result = autoProcessTV.processEpisode(nzbDir, inputName, status) result = autoProcessTV.processEpisode(nzbDir, inputName, status, inputCategory)
elif inputCategory == hpCategory: elif inputCategory in hpCategory:
Logger.info("MAIN: Calling HeadPhones to post-process: %s", inputName) Logger.info("MAIN: Calling HeadPhones to post-process: %s", inputName)
result = autoProcessMusic.process(nzbDir, inputName, status) result = autoProcessMusic.process(nzbDir, inputName, status, inputCategory)
elif inputCategory == mlCategory: elif inputCategory in mlCategory:
Logger.info("MAIN: Calling Mylar to post-process: %s", inputName) Logger.info("MAIN: Calling Mylar to post-process: %s", inputName)
result = autoProcessComics.processEpisode(nzbDir, inputName, status) result = autoProcessComics.processEpisode(nzbDir, inputName, status, inputCategory)
elif inputCategory == gzCategory: elif inputCategory in gzCategory:
Logger.info("MAIN: Calling Gamez to post-process: %s", inputName) Logger.info("MAIN: Calling Gamez to post-process: %s", inputName)
result = autoProcessGames.process(nzbDir, inputName, status) result = autoProcessGames.process(nzbDir, inputName, status, inputCategory)
else: else:
Logger.warning("MAIN: The download category %s does not match any category defines in autoProcessMedia.cfg. Exiting.", inputCategory) Logger.warning("MAIN: The download category %s does not match any category defined in autoProcessMedia.cfg. Exiting.", inputCategory)
sys.exit(POSTPROCESS_ERROR) sys.exit(POSTPROCESS_ERROR)
if result == 0: if result == 0: