only delete archives that were successfully extracted. Fixes #488

This commit is contained in:
clinton-hall 2014-07-14 15:16:12 +09:30
commit 896107591f

View file

@ -860,6 +860,10 @@ def extractFiles(src, dst=None):
for folder in extracted_folder: for folder in extracted_folder:
for inputFile in listMediaFiles(folder, media=False, audio=False, meta=False, archives=True): for inputFile in listMediaFiles(folder, media=False, audio=False, meta=False, archives=True):
fullFileName = os.path.basename(inputFile) fullFileName = os.path.basename(inputFile)
archiveName = os.path.splitext(fullFileName)[0]
archiveName = re.sub(r"part[0-9]+", "", archiveName)
if not archiveName in extracted_archive:
continue # don't remove if we haven't extracted this archive.
logger.info("Removing extracted archive %s from folder %s ..." % (fullFileName, folder)) logger.info("Removing extracted archive %s from folder %s ..." % (fullFileName, folder))
try: try:
os.remove(inputFile) os.remove(inputFile)