From 4cd693b5c4f2ede4ac4928b5b433b3932d64519a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 7 Sep 2014 23:50:03 +0200 Subject: save_join -> safe_join & save_path -> safe_filename --- module/plugins/hooks/MergeFiles.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hooks/MergeFiles.py') 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) -- cgit v1.2.3