summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/ExtractArchive.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-03-23 17:21:15 +0100
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-03-23 17:21:15 +0100
commitc67110356829f517d59ddd7c516dae6e13d08908 (patch)
tree86f3b3003bf559879481cd4153acc4250fb18faf /module/plugins/hooks/ExtractArchive.py
parentMerge pull request #1276 from immenz/Branch_AntiVir (diff)
parent[ExtractArchive] extract archive even if first part is not in package (diff)
downloadpyload-c67110356829f517d59ddd7c516dae6e13d08908.tar.xz
Merge pull request #1278 from immenz/dev_extract
[ExtractArchive] extract archive even if first part is not in package
Diffstat (limited to 'module/plugins/hooks/ExtractArchive.py')
-rw-r--r--module/plugins/hooks/ExtractArchive.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 0c163078c..d9af2dd49 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -106,7 +106,7 @@ class ArchiveQueue(object):
class ExtractArchive(Hook):
__name__ = "ExtractArchive"
__type__ = "hook"
- __version__ = "1.34"
+ __version__ = "1.35"
__config__ = [("activated" , "bool" , "Activated" , True ),
("fullpath" , "bool" , "Extract with full paths" , True ),
@@ -328,7 +328,9 @@ class ExtractArchive(Hook):
success = False
continue
- files_ids.remove((fname, fid, fout)) #: don't let other extractors spam log
+ # remove processed file and related multiparts from list
+ files_ids = [(fname, fid, fout) for fname, fid, fout in files_ids \
+ if fname not in archive.getDeleteFiles()]
self.logDebug("Extracted files: %s" % new_files)
self.setPermissions(new_files)