diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-06-01 23:51:50 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-06-01 23:51:50 +0200 |
| commit | 2133e490761cb269302e5c29dabc35669d0d0607 (patch) | |
| tree | 208a0c5ca7702b45ebf97b35645a46a794e9c22f /module/plugins | |
| parent | [XFSHoster] Improve OFFLINE_PATTERN (diff) | |
| parent | Update SimpleCrypter.py (diff) | |
| download | pyload-2133e490761cb269302e5c29dabc35669d0d0607.tar.xz | |
Merge pull request #1447 from GammaC0de/patch-1
[Dereferer] [SimpleCrypter] bugfixes
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/crypter/Dereferer.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 985c97f3d..85b84a242 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -1,12 +1,14 @@ # -*- coding: utf-8 -*- +import re + from module.plugins.internal.SimpleCrypter import SimpleCrypter class Dereferer(SimpleCrypter): __name__ = "Dereferer" __type__ = "crypter" - __version__ = "0.13" + __version__ = "0.14" __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), @@ -37,4 +39,4 @@ class Dereferer(SimpleCrypter): def getLinks(self): - return [re.match(self.__pattern__, pyfile.url).group('LINK').strip()] + return [re.match(self.__pattern__, self.pyfile.url).group('LINK').strip()] diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index 2d4d52f3c..8a37839b5 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -11,7 +11,7 @@ from module.utils import fixup, html_unescape class SimpleCrypter(Crypter, SimpleHoster): __name__ = "SimpleCrypter" __type__ = "crypter" - __version__ = "0.47" + __version__ = "0.48" __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), #: Overrides core.config['general']['folder_per_package'] @@ -101,7 +101,7 @@ class SimpleCrypter(Crypter, SimpleHoster): def handleDirect(self, pyfile): while True: - header = self.load(self.link or pyfile.url, just_header=True, decode=True) + header = self.load(self.link if hasattr(self, 'link') and self.link else pyfile.url, just_header=True, decode=True) if 'location' in header and header['location']: self.link = header['location'] else: @@ -114,7 +114,7 @@ class SimpleCrypter(Crypter, SimpleHoster): self.logDebug("Looking for link redirect...") self.handleDirect(pyfile) - if self.link: + if hasattr(self, 'link') and self.link: self.urls = [self.link] else: |