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

log warning, prevent crash, and exit gracefully if no manual directories defined.

Browse source
This commit is contained in:
clinton-hall 2014-04-04 09:39:26 +10:30
commit 5165ee31ba
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
autoProcess/nzbToMediaUtil.py
View file

@ -467,14 +467,17 @@ def get_dirnames(section, category):
outputDirectory = "" outputDirectory = ""
# set dirName # set dirName
dirNames = None dirNames = []
if watch_dir != "": if watch_dir != "":
if os.path.exists(watch_dir): if os.path.exists(watch_dir):
dirNames = [os.path.join(watch_dir, o) for o in os.listdir(watch_dir) if dirNames.extend([os.path.join(watch_dir, o) for o in os.listdir(watch_dir) if
os.path.isdir(os.path.join(watch_dir, o))] os.path.isdir(os.path.join(watch_dir, o))])
elif outputDirectory != "": if outputDirectory != "":
if os.path.exists(outputDirectory): if os.path.exists(outputDirectory):
dirNames = [os.path.join(outputDirectory, o) for o in os.listdir(outputDirectory) if dirNames.extend([os.path.join(outputDirectory, o) for o in os.listdir(outputDirectory) if
os.path.isdir(os.path.join(outputDirectory, o))] os.path.isdir(os.path.join(outputDirectory, o))])
if not dirNames:
Logger.warn("No Directories identified to Scan.")
return dirNames return dirNames

2
nzbToMedia.py
View file

@ -414,7 +414,7 @@ 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, inputCategory) result = autoProcessMovie.process(nzbDir, inputName, status, clientAgent, download_id, inputCategory)
elif inputCategory in sbCategory: elif inputCategory in sbCategory:
result = 0 result = 1
if isinstance(nzbDir, list): if isinstance(nzbDir, list):
for dirName in nzbDir: for dirName in nzbDir:
Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName) Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName)

8
nzbToSickBeard.py
View file

@ -229,13 +229,13 @@ elif len(sys.argv) >= SABNZB_0717_NO_OF_ARGUMENTS:
clientAgent = "sabnzbd" clientAgent = "sabnzbd"
result = autoProcessTV.processEpisode(sys.argv[1], sys.argv[2], sys.argv[7], clientAgent, sys.argv[5]) result = autoProcessTV.processEpisode(sys.argv[1], sys.argv[2], sys.argv[7], clientAgent, sys.argv[5])
else: else:
result = 0
sbCategory = (config().get("SickBeard", "sbCategory")).split(',') # tv
dirNames = get_dirnames("SickBeard", sbCategory[0])
Logger.debug("MAIN: Invalid number of arguments received from client.") Logger.debug("MAIN: Invalid number of arguments received from client.")
Logger.info("MAIN: Running autoProcessTV as a manual run...") Logger.info("MAIN: Running autoProcessTV as a manual run...")
result = 1
sbCategory = (config().get("SickBeard", "sbCategory")).split(',') # tv
dirNames = get_dirnames("SickBeard", sbCategory[0])
for dirName in dirNames: for dirName in dirNames:
Logger.info("MAIN: Calling Sick-Beard to post-process: %s", dirName) Logger.info("MAIN: Calling Sick-Beard to post-process: %s", dirName)
result = autoProcessTV.processEpisode(dirName, dirName, 0) result = autoProcessTV.processEpisode(dirName, dirName, 0)