From a6e047b16569802fdbfa16bbbbf44fb2a6e5d1a8 Mon Sep 17 00:00:00 2001 From: Stefano Date: Sun, 15 Sep 2013 11:07:09 -0700 Subject: Merge pull request #218 from vuolter/s/plugin/coreconfig Use config instead core.config for plugins (cherry picked from commit 511f0e17eb598b078a48a6eac0fdab5438cf539c) Conflicts: pyload/plugins/addons/ClickAndLoad.py --- pyload/plugins/addons/MergeFiles.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pyload/plugins/addons/MergeFiles.py') diff --git a/pyload/plugins/addons/MergeFiles.py b/pyload/plugins/addons/MergeFiles.py index ce2a35584..7cd7571d1 100644 --- a/pyload/plugins/addons/MergeFiles.py +++ b/pyload/plugins/addons/MergeFiles.py @@ -30,7 +30,7 @@ BUFFER_SIZE = 4096 class MergeFiles(Addon): __name__ = "MergeFiles" - __version__ = "0.11" + __version__ = "0.12" __description__ = "Merges parts splitted with hjsplit" __config__ = [("activated", "bool", "Activated", "False")] __threaded__ = ["packageFinished"] @@ -52,9 +52,9 @@ class MergeFiles(Addon): files[data["name"][:-4]].sort() fid_dict[data["name"]] = fid - download_folder = self.core.config['general']['download_folder'] + download_folder = self.config['general']['download_folder'] - if self.core.config['general']['folder_per_package']: + if self.config['general']['folder_per_package']: download_folder = save_join(download_folder, pack.folder) for name, file_list in files.iteritems(): -- cgit v1.2.3