summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/MergeFiles.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r--module/plugins/hooks/MergeFiles.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index b5245cc14..d9049c5b2 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -37,9 +37,9 @@ class MergeFiles(Addon):
files[data['name'][:-4]].sort()
fid_dict[data['name']] = fid
- download_folder = self.core.config.get("general", "download_folder")
+ download_folder = self.pyload.config.get("general", "download_folder")
- if self.core.config.get("general", "folder_per_package"):
+ if self.pyload.config.get("general", "folder_per_package"):
download_folder = fs_join(download_folder, pack.folder)
for name, file_list in files.iteritems():
@@ -49,7 +49,7 @@ class MergeFiles(Addon):
for splitted_file in file_list:
self.log_debug("Merging part", splitted_file)
- pyfile = self.core.files.getFile(fid_dict[splitted_file])
+ pyfile = self.pyload.files.getFile(fid_dict[splitted_file])
pyfile.setStatus("processing")