diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-07-29 08:40:17 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-07-29 08:40:17 +0200 |
| commit | e42f5783442fcbaa53e6c0faf943dd33c397e0b3 (patch) | |
| tree | d5929a9bd2618320eee2a4f08bd67b258cef9de6 /module/plugins/crypter | |
| parent | Fix https://github.com/pyload/pyload/issues/1588 (diff) | |
| download | pyload-e42f5783442fcbaa53e6c0faf943dd33c397e0b3.tar.xz | |
Fix _log method
Diffstat (limited to 'module/plugins/crypter')
| -rw-r--r-- | module/plugins/crypter/LinkdecrypterCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/crypter/XFileSharingProFolder.py | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 242899c33..d8812dbd5 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -2,13 +2,13 @@ import re -from module.plugins.internal.Crypter import Crypter +from module.plugins.internal.MultiCrypter import MultiCrypter -class LinkdecrypterCom(Crypter): +class LinkdecrypterCom(MultiCrypter): __name__ = "LinkdecrypterCom" __type__ = "crypter" - __version__ = "0.31" + __version__ = "0.32" __status__ = "testing" __pattern__ = r'^unmatchable$' diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py index 834843c71..1340faf35 100644 --- a/module/plugins/crypter/XFileSharingProFolder.py +++ b/module/plugins/crypter/XFileSharingProFolder.py @@ -8,7 +8,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class XFileSharingProFolder(XFSCrypter): __name__ = "XFileSharingProFolder" __type__ = "crypter" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+' @@ -21,7 +21,10 @@ class XFileSharingProFolder(XFSCrypter): def _log(self, level, plugintype, pluginname, messages): - return super(XFileSharingProFolder, self)._log(level, plugintype, pluginname, (self.HOSTER_NAME,) + messages) + return super(XFileSharingProFolder, self)._log(level, + plugintype, + "%s: %s" % (pluginname, self.HOSTER_NAME), + messages) def init(self): |