summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/ExtractArchive.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-07 23:50:03 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-14 10:59:52 +0200
commit4cd693b5c4f2ede4ac4928b5b433b3932d64519a (patch)
tree5a22ec483885290094ac38a06a8c3bf877856820 /module/plugins/hooks/ExtractArchive.py
parentMerge branch 'stable' into 0.4.10 (diff)
downloadpyload-4cd693b5c4f2ede4ac4928b5b433b3932d64519a.tar.xz
save_join -> safe_join & save_path -> safe_filename
Diffstat (limited to 'module/plugins/hooks/ExtractArchive.py')
-rw-r--r--module/plugins/hooks/ExtractArchive.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 144829459..183f189a6 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -49,7 +49,7 @@ if os.name != "nt":
from module.plugins.Hook import Hook, threaded, Expose
from module.plugins.internal.AbstractExtractor import ArchiveError, CRCError, WrongPassword
-from module.utils import save_join, fs_encode
+from module.utils import safe_join, fs_encode
class ExtractArchive(Hook):
@@ -148,21 +148,21 @@ class ExtractArchive(Hook):
continue
# determine output folder
- out = save_join(dl, p.folder, "")
+ out = safe_join(dl, p.folder, "")
# force trailing slash
if self.getConfig("destination") and self.getConfig("destination").lower() != "none":
- out = save_join(dl, p.folder, self.getConfig("destination"), "")
+ out = safe_join(dl, p.folder, self.getConfig("destination"), "")
#relative to package folder if destination is relative, otherwise absolute path overwrites them
if self.getConfig("subfolder"):
- out = save_join(out, fs_encode(p.folder))
+ out = safe_join(out, fs_encode(p.folder))
if not exists(out):
makedirs(out)
- files_ids = [(save_join(dl, p.folder, x['name']), x['id']) for x in p.getChildren().itervalues()]
+ files_ids = [(safe_join(dl, p.folder, x['name']), x['id']) for x in p.getChildren().itervalues()]
matched = False
# check as long there are unseen files