diff options
| author |  Nitzo <nitzo2001@yahoo.com>
| 2016-01-10 00:06:51 +0100 |
|---|---|---|
| committer | Nitzo <nitzo2001@yahoo.com>
| 2016-01-10 00:06:51 +0100 |
| commit | 82d2947600bd4de895832eae039308b1314125ae (patch) | |
| tree | 143ae5adf3d813a3388e028e5c34f2cc31a396f8 /module | |
| parent | [Misc] fix safepath (diff) | |
| download | pyload-82d2947600bd4de895832eae039308b1314125ae.tar.xz | |
[ExternalScripts] Update
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/hooks/ExternalScripts.py | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index c78bce5a2..cf39417fd 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -10,7 +10,7 @@ from module.plugins.internal.misc import encode class ExternalScripts(Addon): __name__ = "ExternalScripts" __type__ = "hook" - __version__ = "0.67" + __version__ = "0.68" __status__ = "testing" __config__ = [("activated", "bool", "Activated" , True ), @@ -18,7 +18,8 @@ class ExternalScripts(Addon): __description__ = """Run external scripts""" __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __authors__ = [("Walter Purcaro", "vuolter@gmail.com" ), + ("GammaC0de" , "nitzo2001[AT}yahoo[DOT]com")] def init(self): @@ -26,17 +27,16 @@ class ExternalScripts(Addon): self.folders = ["pyload_start", "pyload_restart", "pyload_stop", "before_reconnect", "after_reconnect", - "download_preparing", "download_failed", "download_finished", + "download_preparing", "download_failed", + "download_finished", "download_processed", #@TODO: Invert 'download_processed', 'download_finished' order in 0.4.10 "archive_extract_failed", "archive_extracted", - "package_finished", "package_deleted", "package_extract_failed", "package_extracted", + "package_finished", "package_processed", #@TODO: Invert 'package_finished', 'package_processed' order in 0.4.10 + "package_deleted", "package_extract_failed", "package_extracted", "all_downloads_processed", "all_downloads_finished", #@TODO: Invert `all_downloads_processed`, `all_downloads_finished` order in 0.4.10 "all_archives_extracted", "all_archives_processed"] - self.event_map = {'allDownloadsFinished' : "all_downloads_finished" , - 'allDownloadsProcessed' : "all_downloads_processed", - 'packageDeleted' : "package_deleted" , - 'archive_extract_failed': "archive_extract_failed" , + self.event_map = {'archive_extract_failed': "archive_extract_failed" , 'archive_extracted' : "archive_extracted" , 'package_extract_failed': "package_extract_failed" , 'package_extracted' : "package_extracted" , @@ -184,6 +184,12 @@ class ExternalScripts(Addon): self.call_script("download_finished", *args) + def download_processed(self, pyfile): + file = pyfile.plugin.last_download + args = [pyfile.id, pyfile.name, file, pyfile.pluginname, pyfile.url] + self.call_script("download_processed", *args) + + def archive_extract_failed(self, pyfile, archive): args = [pyfile.id, pyfile.name, archive.filename, archive.out, archive.files] self.call_script("archive_extract_failed", *args) @@ -204,6 +210,16 @@ class ExternalScripts(Addon): self.call_script("package_finished", *args) + def package_processed(self, pypack): + dl_folder = self.pyload.config.get("general", "download_folder") + + if self.pyload.config.get("general", "folder_per_package"): + dl_folder = os.path.join(dl_folder, pypack.folder) + + args = [pypack.id, pypack.name, dl_folder, pypack.password] + self.call_script("package_processed", *args) + + def package_deleted(self, pid): dl_folder = self.pyload.config.get("general", "download_folder") pdata = self.pyload.api.getPackageInfo(pid) |