diff options
Diffstat (limited to 'pyload/plugin/extractor')
| -rw-r--r-- | pyload/plugin/extractor/SevenZip.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/extractor/UnRar.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pyload/plugin/extractor/SevenZip.py b/pyload/plugin/extractor/SevenZip.py index 1d7d57886..eeafd3f6f 100644 --- a/pyload/plugin/extractor/SevenZip.py +++ b/pyload/plugin/extractor/SevenZip.py @@ -6,7 +6,7 @@ import re from subprocess import Popen, PIPE from pyload.plugin.extractor.UnRar import ArchiveError, CRCError, PasswordError, UnRar, renice -from pyload.utils import fs_encode, safe_join +from pyload.utils import fs_encode, fs_join class SevenZip(UnRar): @@ -131,7 +131,7 @@ class SevenZip(UnRar): result = set() for groups in self.re_filelist.findall(out): f = groups[-1].strip() - result.add(safe_join(self.out, f)) + result.add(fs_join(self.out, f)) return list(result) diff --git a/pyload/plugin/extractor/UnRar.py b/pyload/plugin/extractor/UnRar.py index a8279bfa9..07cd19959 100644 --- a/pyload/plugin/extractor/UnRar.py +++ b/pyload/plugin/extractor/UnRar.py @@ -8,7 +8,7 @@ from string import digits from subprocess import Popen, PIPE from pyload.plugin.Extractor import Extractor, ArchiveError, CRCError, PasswordError -from pyload.utils import decode, fs_encode, safe_join +from pyload.utils import decode, fs_encode, fs_join def renice(pid, value): @@ -178,7 +178,7 @@ class UnRar(Extractor): files = [self.filename] # eventually Multipart Files - files.extend(safe_join(dir, os.path.basename(file)) for file in filter(self.isMultipart, os.listdir(dir)) + files.extend(fs_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 @@ -200,13 +200,13 @@ class UnRar(Extractor): if not self.fullpath and self.VERSION.startswith('5'): # NOTE: Unrar 5 always list full path for f in decode(out).splitlines(): - f = safe_join(self.out, os.path.basename(f.strip())) + f = fs_join(self.out, os.path.basename(f.strip())) if os.path.isfile(f): - result.add(safe_join(self.out, os.path.basename(f))) + result.add(fs_join(self.out, os.path.basename(f))) else: for f in decode(out).splitlines(): f = f.strip() - result.add(safe_join(self.out, f)) + result.add(fs_join(self.out, f)) return list(result) |