summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/MergeFiles.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2013-08-02 01:03:54 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2013-09-03 23:07:54 +0200
commit6a6ec88816afecf43430e63908e8b2330b567b5f (patch)
tree849fa07d37b8eeebfed11a4b4426d8990b9da323 /module/plugins/hooks/MergeFiles.py
parentBitshareCom: fixes (diff)
downloadpyload-6a6ec88816afecf43430e63908e8b2330b567b5f.tar.xz
Plugins: core.config -> config
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 060dae7a2..869b5b6f8 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -30,7 +30,7 @@ BUFFER_SIZE = 4096
class MergeFiles(Hook):
__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(Hook):
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():