Moved config migration code into our config class, makes more sense.

Added more detailed log messages for get_dirnames function.
This commit is contained in:
echel0n 2014-04-05 21:28:12 -07:00
commit 0ce4bb601d
10 changed files with 269 additions and 270 deletions

View file

@ -452,31 +452,38 @@ def parse_args(clientAgent):
return clients[clientAgent](sys.argv)
def get_dirnames(section, inputCategory):
dirNames = []
try:
watch_dir = config()[section][inputCategory]["watch_dir"]
if not os.path.exists(watch_dir):
watch_dir = ""
except:
watch_dir = ""
try:
outputDirectory = os.path.join(config()["Torrent"]["outputDirectory"], inputCategory)
if not os.path.exists(watch_dir):
outputDirectory = ""
except:
outputDirectory = ""
# set dirName
dirNames = []
if watch_dir != "":
if os.path.exists(watch_dir):
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))])
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))])
if not dirNames:
Logger.warn("No Directories identified to Scan inside " + watch_dir)
if outputDirectory != "":
if os.path.exists(outputDirectory):
dirNames.extend([os.path.join(outputDirectory, o) for o in os.listdir(outputDirectory) if
os.path.isdir(os.path.join(outputDirectory, o))])
dirNames.extend([os.path.join(outputDirectory, o) for o in os.listdir(outputDirectory) if
os.path.isdir(os.path.join(outputDirectory, o))])
if not dirNames:
Logger.warn("No Directories identified to Scan inside " + outputDirectory)
if watch_dir == "" and outputDirectory == "":
Logger.warn("No watch_dir or outputDirectory setup to be Scanned, go fix you autoProcessMedia.cfg file.")
return dirNames
def delete(dirName):