diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-24 17:16:34 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-24 17:16:34 +0100 |
| commit | 3ae2fbb170ad0f2bfe1ebf7f59e76d3645861f0a (patch) | |
| tree | b01e2c881aaf744aaab0af613a7a26e7129f2028 /module/plugins/addons/ExternalScripts.py | |
| parent | enter captchas on webui (diff) | |
| parent | Rapidgator: fixed bug #47 (diff) | |
| download | pyload-3ae2fbb170ad0f2bfe1ebf7f59e76d3645861f0a.tar.xz | |
Merge remote-tracking branch 'origin/stable'
Conflicts:
module/plugins/accounts/FilesonicCom.py
module/plugins/accounts/OronCom.py
module/plugins/accounts/ShareonlineBiz.py
module/plugins/addons/UpdateManager.py
module/plugins/crypter/FilesonicComFolder.py
module/plugins/hoster/BezvadataCz.py
module/plugins/hoster/EuroshareEu.py
module/plugins/hoster/FilesonicCom.py
module/plugins/hoster/MegauploadCom.py
module/plugins/hoster/Premium4Me.py
module/plugins/hoster/YoutubeCom.py
module/plugins/internal/MultiHoster.py
module/utils.py
Diffstat (limited to 'module/plugins/addons/ExternalScripts.py')
| -rw-r--r-- | module/plugins/addons/ExternalScripts.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/addons/ExternalScripts.py b/module/plugins/addons/ExternalScripts.py index 00fc7c114..8f5a5841e 100644 --- a/module/plugins/addons/ExternalScripts.py +++ b/module/plugins/addons/ExternalScripts.py @@ -26,7 +26,7 @@ from module.utils.fs import save_join, exists, join, listdir class ExternalScripts(Addon): __name__ = "ExternalScripts" - __version__ = "0.21" + __version__ = "0.22" __description__ = """Run external scripts""" __config__ = [("activated", "bool", "Activated", "True")] __author_name__ = ("mkaay", "RaNaN", "spoob") @@ -84,7 +84,7 @@ class ExternalScripts(Addon): def downloadFinished(self, pyfile): for script in self.scripts['download_finished']: - self.callScript(script, pyfile.pluginname, pyfile.url, pyfile.name, pyfile.id, + self.callScript(script, pyfile.pluginname, pyfile.url, pyfile.name, save_join(self.core.config['general']['download_folder'], pyfile.package().folder, pyfile.name), pyfile.id) @@ -94,7 +94,7 @@ class ExternalScripts(Addon): folder = self.core.config['general']['download_folder'] folder = save_join(folder, pypack.folder) - self.callScript(script, pypack.name, folder, pypack.id) + self.callScript(script, pypack.name, folder, pypack.password, pypack.id) def beforeReconnecting(self, ip): for script in self.scripts['before_reconnect']: |