diff options
| author |  Jens Hörnlein <jens.hoernlein@googlemail.com>
| 2015-02-04 00:02:27 +0100 |
|---|---|---|
| committer | Jens Hörnlein <jens.hoernlein@googlemail.com>
| 2015-02-04 00:16:43 +0100 |
| commit | 896f1f1437442bb9a93a0664f3d447bbc0f444cd (patch) | |
| tree | 636493ea42cc8da64814b1ed17ff6d1c41ddde1a /module/plugins/hooks | |
| parent | [GoogledriveCom] Cleanup (diff) | |
| download | pyload-896f1f1437442bb9a93a0664f3d447bbc0f444cd.tar.xz | |
Addressed some Extractor Issues
Diffstat (limited to 'module/plugins/hooks')
| -rw-r--r-- | module/plugins/hooks/ExtractArchive.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index 47325608d..e1c05878c 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.24" + __version__ = "1.25" __config__ = [("activated" , "bool" , "Activated" , True ), ("fullpath" , "bool" , "Extract with full paths" , True ), @@ -312,7 +312,7 @@ class ExtractArchive(Hook): self.setPermissions(new_files) for filename in new_files: - file = fs_encode(filename) + file = fs_encode(save_join(filename, os.path.dirname(archive.filename))) if not os.path.exists(file): self.logDebug("New file %s does not exists" % filename) continue @@ -390,7 +390,7 @@ class ExtractArchive(Hook): if not encrypted or not self.getConfig("usepasswordfile"): archive.extract(password) else: - for pw in set(self.getPasswords(False) + [password]): + for pw in uniqify([password] + self.getPasswords(False)): try: self.logDebug("Try password: %s" % pw) @@ -465,7 +465,7 @@ class ExtractArchive(Hook): file = fs_encode(self.getConfig("passwordfile")) with open(file) as f: - for pw in f.read().splitlines()[:-1]: + for pw in f.read().splitlines(): passwords.append(pw) except IOError, e: |