diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-29 00:54:25 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-29 00:54:25 +0200 |
| commit | 08252b978c699bae3493cf1bee4accc285fc30b5 (patch) | |
| tree | 1c6864f92d466f55b0530ce5c5c915e8b18cdec2 /module/plugins/internal | |
| parent | [UpdateManager] Fix https://github.com/pyload/pyload/issues/1432 (diff) | |
| download | pyload-08252b978c699bae3493cf1bee4accc285fc30b5.tar.xz | |
[GooGl] Update
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/SimpleDereferer.py | 10 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py index fad1559c7..3a5f21900 100644 --- a/module/plugins/internal/SimpleDereferer.py +++ b/module/plugins/internal/SimpleDereferer.py @@ -4,17 +4,17 @@ import re import urllib from module.plugins.Crypter import Crypter -from module.plugins.internal.SimpleHoster import getFileURL, set_cookies +from module.plugins.internal.SimpleHoster import create_getInfo, getFileURL, set_cookies +from module.utils import html_unescape class SimpleDereferer(Crypter): __name__ = "SimpleDereferer" __type__ = "crypter" - __version__ = "0.11" + __version__ = "0.12" __pattern__ = r'^unmatchable$' - __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] + __config__ = [] #@TODO: Remove in 0.4.10 __description__ = """Simple dereferer plugin""" __license__ = "GPLv3" @@ -91,7 +91,7 @@ class SimpleDereferer(Crypter): def getLink(self): try: - return re.search(self.LINK_PATTERN, self.html).group(1) + return html_unescape(re.search(self.LINK_PATTERN, self.html).group(1).decode('unicode-escape')) #@TODO: Move this check to plugin `load` method in 0.4.10 except Exception: pass diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index d3c269548..0a9986d4c 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -509,7 +509,7 @@ class SimpleHoster(Hoster): self.correctCaptcha() - link = html_unescape(link.decode('unicode-escape')) #@TODO: Move this check to plugin `load` method + link = html_unescape(link.decode('unicode-escape')) #@TODO: Move this check to plugin `load` method in 0.4.10 if not urlparse.urlparse(link).scheme: url_p = urlparse.urlparse(self.pyfile.url) |