summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-03 01:10:04 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-03 01:10:04 +0100
commit8d8cfd57fa44cb84eb9709871bf14a3b4d13d994 (patch)
treea136d466d3aa6e8a80da3a26f3864bd2e544fe7b /module/plugins/hooks
parent[MegaCoNzFolder] Fixup (diff)
downloadpyload-8d8cfd57fa44cb84eb9709871bf14a3b4d13d994.tar.xz
Update Extractor (4)
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/ExtractArchive.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 74dded9b7..47325608d 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -103,7 +103,7 @@ class ArchiveQueue(object):
class ExtractArchive(Hook):
__name__ = "ExtractArchive"
__type__ = "hook"
- __version__ = "1.23"
+ __version__ = "1.24"
__config__ = [("activated" , "bool" , "Activated" , True ),
("fullpath" , "bool" , "Extract with full paths" , True ),
@@ -205,6 +205,9 @@ class ExtractArchive(Hook):
def extract(self, ids):
+ if not ids:
+ return False
+
self.extracting = True
processed = []
@@ -226,7 +229,7 @@ class ExtractArchive(Hook):
excludefiles = toList(self.getConfig("excludefiles"))
if extensions:
- self.logDebug("Extensions: %s" % "|.".join(extensions))
+ self.logDebug("Use for extensions: %s" % "|.".join(extensions))
# reload from txt file
self.reloadPasswords()
@@ -462,7 +465,7 @@ class ExtractArchive(Hook):
file = fs_encode(self.getConfig("passwordfile"))
with open(file) as f:
- for pw in f.read().splitlines():
+ for pw in f.read().splitlines()[:-1]:
passwords.append(pw)
except IOError, e: