diff options
| author |  Jens Hörnlein <jens.hoernlein@googlemail.com>
| 2015-02-11 16:32:55 +0100 |
|---|---|---|
| committer | Jens Hörnlein <jens.hoernlein@googlemail.com>
| 2015-02-11 16:37:38 +0100 |
| commit | f2ac32085922f739343bac3cf396e703833323f4 (patch) | |
| tree | c9f39679a5585b9bed918c239ac4a2621313ac06 | |
| parent | [ExtractArchive] better Multipart behavior, new version output (diff) | |
| download | pyload-f2ac32085922f739343bac3cf396e703833323f4.tar.xz | |
[UnRar] bugfixes
| -rw-r--r-- | module/plugins/internal/Extractor.py | 3 | ||||
| -rw-r--r-- | module/plugins/internal/UnRar.py | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py index 56860ad53..b445f1497 100644 --- a/module/plugins/internal/Extractor.py +++ b/module/plugins/internal/Extractor.py @@ -24,7 +24,8 @@ class Extractor: __description__ = """Base extractor plugin""" __license__ = "GPLv3" __authors__ = [("RaNaN", "ranan@pyload.org"), - ("Walter Purcaro", "vuolter@gmail.com")] + ("Walter Purcaro", "vuolter@gmail.com"), + ("Immenz", "immenz@gmx.net")] EXTENSIONS = [] diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index f6ca5a2eb..54d64c430 100644 --- a/module/plugins/internal/UnRar.py +++ b/module/plugins/internal/UnRar.py @@ -22,12 +22,13 @@ def renice(pid, value): class UnRar(Extractor): __name__ = "UnRar" - __version__ = "1.12" + __version__ = "1.13" __description__ = """Rar extractor plugin""" __license__ = "GPLv3" __authors__ = [("RaNaN", "RaNaN@pyload.org"), - ("Walter Purcaro", "vuolter@gmail.com")] + ("Walter Purcaro", "vuolter@gmail.com"), + ("Immenz", "immenz@gmx.net"),] CMD = "unrar" @@ -179,7 +180,7 @@ class UnRar(Extractor): files = [self.filename] # eventually Multipart Files - files.extend(save_join(self.out, os.path.basename(file)) for file in filter(self.isMultipart, os.listdir(dir)) + files.extend(save_join(dir, os.path.basename(file)) for file in filter(self.isMultipart, os.listdir(dir)) if re.sub(self.re_multipart,".rar",name) == re.sub(self.re_multipart,".rar",file)) return files @@ -198,7 +199,7 @@ class UnRar(Extractor): self.manager.logError(err.strip()) result = set() - if not self.fullpath and self.rarversion.startswith('5'): + if not self.fullpath and self.VERSION.startswith('5'): # NOTE: Unrar 5 always list full path for f in decode(out).splitlines(): f = save_join(self.out, os.path.basename(f.strip())) |