diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-09-15 20:07:09 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-09-24 19:45:29 +0200 |
| commit | a6e047b16569802fdbfa16bbbbf44fb2a6e5d1a8 (patch) | |
| tree | e8540e761bbf55f9c7d1a31e0769bbe1c8ed002a /pyload/plugins/addons/MergeFiles.py | |
| parent | improved login / logout rendering (diff) | |
| download | pyload-a6e047b16569802fdbfa16bbbbf44fb2a6e5d1a8.tar.xz | |
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
Diffstat (limited to 'pyload/plugins/addons/MergeFiles.py')
| -rw-r--r-- | pyload/plugins/addons/MergeFiles.py | 6 |
1 files changed, 3 insertions, 3 deletions
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(): |