summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/ExtractArchive.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-12-28 23:46:24 +0100
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-12-28 23:46:24 +0100
commit58878a455067837dbe72c690606157831d3afae1 (patch)
treeac59fe8fa23a2531f7fdf03341ed1eff0326f67f /module/plugins/hooks/ExtractArchive.py
parentSpare code fixes (2) (diff)
downloadpyload-58878a455067837dbe72c690606157831d3afae1.tar.xz
Spare code fixes (3)
Diffstat (limited to 'module/plugins/hooks/ExtractArchive.py')
-rw-r--r--module/plugins/hooks/ExtractArchive.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 96c8d7ed3..a60205f20 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -99,7 +99,7 @@ class ExtractArchive(Addon):
__name__ = "ExtractArchive"
__type__ = "hook"
__version__ = "1.54"
- __status__ = "testing"
+ __status__ = "broken"
__config__ = [("activated" , "bool" , "Activated" , True ),
("fullpath" , "bool" , "Extract with full paths" , True ),
@@ -142,7 +142,7 @@ class ExtractArchive(Addon):
def activate(self):
- for p in ("UnRar", "SevenZip", "UnZip"):
+ for p in ("UnRar", "SevenZip", "UnZip", "UnTar"):
try:
module = self.pyload.pluginManager.loadModule("internal", p)
klass = getattr(module, p)
@@ -277,8 +277,8 @@ class ExtractArchive(Addon):
matched = False
success = True
- files_ids = dict((pylink['name'], ((fsjoin(dl_folder, pypack.folder, pylink['name'])), pylink['id'], out)) for pylink \
- in sorted(pypack.getChildren().values(), key=lambda k: k['name'])).values() #: Remove duplicates
+ files_ids = dict((fdata['name'], ((fsjoin(dl_folder, pypack.folder, fdata['name'])), fid, out)) for fid, fdata \
+ in sorted(pypack.getChildren().values(), key=lambda k: k['name'])).items() #: Remove duplicates
#: Check as long there are unseen files
while files_ids: