Flatten after extract. Extract SubDirs and multi archives. Typo.

This commit is contained in:
clinton-hall 2014-07-08 16:52:39 +09:30
commit 863fd3ef5c
2 changed files with 19 additions and 18 deletions

View file

@ -159,15 +159,15 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
except:
logger.error("Failed to link: %s to %s" % (inputFile, targetFile))
if not inputCategory in nzbtomedia.NOFLATTEN: #don't flatten hp in case multi cd albums, and we need to copy this back later.
nzbtomedia.flatten(outputDestination)
inputName, outputDestination = convert_to_ascii(inputName, outputDestination)
if extract == 1:
logger.debug('Checking for archives to extract in directory: %s' % (outputDestination))
nzbtomedia.extractFiles(outputDestination)
if not inputCategory in nzbtomedia.NOFLATTEN: #don't flatten hp in case multi cd albums, and we need to copy this back later.
nzbtomedia.flatten(outputDestination)
# Now check if video files exist in destination:
if sectionName in ["SickBeard", "NzbDrone", "CouchPotato"]:
numVideos = len(