diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-09-07 23:50:03 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-09-14 10:59:52 +0200 |
| commit | 4cd693b5c4f2ede4ac4928b5b433b3932d64519a (patch) | |
| tree | 5a22ec483885290094ac38a06a8c3bf877856820 /module/plugins/hooks/MergeFiles.py | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-4cd693b5c4f2ede4ac4928b5b433b3932d64519a.tar.xz | |
save_join -> safe_join & save_path -> safe_filename
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
| -rw-r--r-- | module/plugins/hooks/MergeFiles.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index a859092fb..ad1de7e6a 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -5,7 +5,7 @@ import re import traceback from module.plugins.Hook import Hook, threaded -from module.utils import save_join, fs_encode +from module.utils import safe_join, fs_encode class MergeFiles(Hook): @@ -41,11 +41,11 @@ class MergeFiles(Hook): download_folder = self.config['general']['download_folder'] if self.config['general']['folder_per_package']: - download_folder = save_join(download_folder, pack.folder) + download_folder = safe_join(download_folder, pack.folder) for name, file_list in files.iteritems(): self.logInfo("Starting merging of %s" % name) - final_file = open(save_join(download_folder, name), "wb") + final_file = open(safe_join(download_folder, name), "wb") for splitted_file in file_list: self.logDebug("Merging part %s" % splitted_file) |