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/ExternalScripts.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pyload/plugins/addons/ExternalScripts.py') diff --git a/pyload/plugins/addons/ExternalScripts.py b/pyload/plugins/addons/ExternalScripts.py index 49774a42b..7b7dafae4 100644 --- a/pyload/plugins/addons/ExternalScripts.py +++ b/pyload/plugins/addons/ExternalScripts.py @@ -27,7 +27,7 @@ from module.utils.fs import save_join, exists, join, listdir class ExternalScripts(Addon): __name__ = "ExternalScripts" - __version__ = "0.22" + __version__ = "0.23" __description__ = """Run external scripts""" __config__ = [("activated", "bool", "Activated", "True")] __author_name__ = ("mkaay", "RaNaN", "spoob") @@ -84,12 +84,12 @@ class ExternalScripts(Addon): def downloadFinished(self, pyfile): for script in self.scripts['download_finished']: self.callScript(script, pyfile.pluginname, pyfile.url, pyfile.name, - save_join(self.core.config['general']['download_folder'], + save_join(self.config['general']['download_folder'], pyfile.package().folder, pyfile.name), pyfile.id) def packageFinished(self, pypack): for script in self.scripts['package_finished']: - folder = self.core.config['general']['download_folder'] + folder = self.config['general']['download_folder'] folder = save_join(folder, pypack.folder) self.callScript(script, pypack.name, folder, pypack.password, pypack.id) -- cgit v1.2.3