diff options
Diffstat (limited to 'module/plugins/internal/SimpleDereferer.py')
| -rw-r--r-- | module/plugins/internal/SimpleDereferer.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py index 53b80f827..bd00f5d25 100644 --- a/module/plugins/internal/SimpleDereferer.py +++ b/module/plugins/internal/SimpleDereferer.py @@ -5,13 +5,13 @@ import re from urllib import unquote from module.plugins.Crypter import Crypter -from module.plugins.internal.SimpleHoster import directLink, set_cookies +from module.plugins.internal.SimpleHoster import fileUrl, set_cookies class SimpleDereferer(Crypter): __name__ = "SimpleDereferer" __type__ = "crypter" - __version__ = "0.03" + __version__ = "0.07" __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), @@ -45,7 +45,7 @@ class SimpleDereferer(Crypter): def decrypt(self, pyfile): - link = directLink(self, pyfile.url) + link = fileUrl(self, pyfile.url) if not link: try: @@ -54,10 +54,6 @@ class SimpleDereferer(Crypter): except Exception: self.prepare() self.preload() - - if self.html is None: - self.fail(_("No html retrieved")) - self.checkStatus() link = self.getLink() @@ -66,10 +62,13 @@ class SimpleDereferer(Crypter): self.urls = [link.strip()] #@TODO: Remove `.strip()` in 0.4.10 elif not self.urls and not self.packages: #@TODO: Remove in 0.4.10 - self.fail("No link grabbed") + self.fail(_("No link grabbed")) def prepare(self): + self.info = {} + self.html = "" + self.req.setOption("timeout", 120) if isinstance(self.COOKIES, list): |