diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-30 15:54:38 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-30 15:54:38 +0200 |
| commit | fcdc1f730118050e390ad2d9fa337ce62809d9a6 (patch) | |
| tree | be69dbc646d385cc34b8de8cd8e0fc082a6c6882 /module/plugins/crypter/Dereferer.py | |
| parent | [XFileSharingPro][XFileSharingProFolder] Added default __pattern__ (diff) | |
| download | pyload-fcdc1f730118050e390ad2d9fa337ce62809d9a6.tar.xz | |
[SimpleCrypter] Merge with SimpleDereferer
Diffstat (limited to 'module/plugins/crypter/Dereferer.py')
| -rw-r--r-- | module/plugins/crypter/Dereferer.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 8e56a7bfc..985c97f3d 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleDereferer import SimpleDereferer +from module.plugins.internal.SimpleCrypter import SimpleCrypter -class Dereferer(SimpleDereferer): +class Dereferer(SimpleCrypter): __name__ = "Dereferer" __type__ = "crypter" - __version__ = "0.12" + __version__ = "0.13" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>(?:ht|f)tps?://.+)' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), @@ -36,9 +36,5 @@ class Dereferer(SimpleDereferer): self.HOSTER_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.') - def getLink(self): - try: - return re.match(self.__pattern__, pyfile.url).group('LINK').strip() - - except Exception, e: - self.logWarning(e) + def getLinks(self): + return [re.match(self.__pattern__, pyfile.url).group('LINK').strip()] |