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

fix issues with processing categories that are disabled. Fix category testing.

Browse source
This commit is contained in:
clinton-hall 2014-09-11 15:25:23 +09:30
commit b61aca7e68
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TorrentToMedia.py
View file

@ -266,6 +266,8 @@ def main(args):
for section, subsections in nzbtomedia.SECTIONS.items(): for section, subsections in nzbtomedia.SECTIONS.items():
for subsection in subsections: for subsection in subsections:
if not nzbtomedia.CFG[section][subsection].isenabled():
continue
for dirName in nzbtomedia.getDirs(section, subsection, link='hard'): for dirName in nzbtomedia.getDirs(section, subsection, link='hard'):
logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName)) logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName))

2
nzbToMedia.py
View file

@ -710,6 +710,8 @@ def main(args, section=None):
for section, subsections in nzbtomedia.SECTIONS.items(): for section, subsections in nzbtomedia.SECTIONS.items():
for subsection in subsections: for subsection in subsections:
if not nzbtomedia.CFG[section][subsection].isenabled():
continue
for dirName in getDirs(section, subsection, link = 'move'): for dirName in getDirs(section, subsection, link = 'move'):
logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName)) logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName))

3
nzbtomedia/__init__.py
View file

@ -648,7 +648,8 @@ def initialize(section=None):
# check for script-defied section and if None set to allow sections # check for script-defied section and if None set to allow sections
SECTIONS = CFG[tuple(x for x in CFG if CFG[x].sections and CFG[x].isenabled()) if not section else (section,)] SECTIONS = CFG[tuple(x for x in CFG if CFG[x].sections and CFG[x].isenabled()) if not section else (section,)]
map(CATEGORIES.extend,([subsection.sections for section,subsection in SECTIONS.items()])) for section,subsections in SECTIONS.items():
CATEGORIES.extend([subsection for subsection in subsections if CFG[section][subsection].isenabled()])
CATEGORIES = list(set(CATEGORIES)) CATEGORIES = list(set(CATEGORIES))
# create torrent class # create torrent class

18
nzbtomedia/nzbToMediaUtil.py
View file

@ -99,13 +99,17 @@ def category_search(inputDirectory, inputName, inputCategory, root, categories):
pathlist = os.path.normpath(inputDirectory).split(os.sep) pathlist = os.path.normpath(inputDirectory).split(os.sep)
try: if inputCategory and inputCategory in pathlist:
inputCategory = list(set(pathlist) & set(categories))[-1] # assume last match is most relevant category. logger.debug("SEARCH: Found the Category: %s in directory structure" % (inputCategory))
logger.debug("SEARCH: Found Category: %s in directory structure" % (inputCategory)) elif inputCategory:
except IndexError: logger.debug("SEARCH: Could not find the category: %s in the directory structure" % (inputCategory))
inputCategory = "" else:
logger.debug("SEARCH: Could not find a category in the directory structure") try:
inputCategory = list(set(pathlist) & set(categories))[-1] # assume last match is most relevant category.
logger.debug("SEARCH: Found Category: %s in directory structure" % (inputCategory))
except IndexError:
inputCategory = ""
logger.debug("SEARCH: Could not find a category in the directory structure")
if not os.path.isdir(inputDirectory) and os.path.isfile(inputDirectory): # If the input directory is a file if not os.path.isdir(inputDirectory) and os.path.isfile(inputDirectory): # If the input directory is a file
if not inputName: inputName = os.path.split(os.path.normpath(inputDirectory))[1] if not inputName: inputName = os.path.split(os.path.normpath(inputDirectory))[1]
return inputDirectory, inputName, inputCategory, root return inputDirectory, inputName, inputCategory, root