diff options
Diffstat (limited to 'module/plugins/hoster')
| -rw-r--r-- | module/plugins/hoster/GoogledriveCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/Http.py | 46 | ||||
| -rw-r--r-- | module/plugins/hoster/Share4WebCom.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/XFileSharing.py (renamed from module/plugins/hoster/XFileSharingPro.py) | 14 |
4 files changed, 29 insertions, 38 deletions
diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py index 00a540e47..6b49a45a6 100644 --- a/module/plugins/hoster/GoogledriveCom.py +++ b/module/plugins/hoster/GoogledriveCom.py @@ -13,7 +13,7 @@ from module.plugins.internal.utils import html_unescape class GoogledriveCom(SimpleHoster): __name__ = "GoogledriveCom" __type__ = "hoster" - __version__ = "0.15" + __version__ = "0.16" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(drive|docs)\.google\.com/(file/d/\w+|uc\?.*id=)' @@ -45,7 +45,7 @@ class GoogledriveCom(SimpleHoster): return link = self.fixurl(link, "https://docs.google.com/") - dl = self.is_download(link, redirect=False) + dl = self.isdownload(link, redirect=False) if not dl: self.html = self.load(link) diff --git a/module/plugins/hoster/Http.py b/module/plugins/hoster/Http.py index 4e7ad0316..af82ca0ac 100644 --- a/module/plugins/hoster/Http.py +++ b/module/plugins/hoster/Http.py @@ -3,14 +3,13 @@ import re import urlparse -from module.network.HTTPRequest import BadHeader from module.plugins.internal.Hoster import Hoster, create_getInfo class Http(Hoster): __name__ = "Http" __type__ = "hoster" - __version__ = "0.02" + __version__ = "0.03" __status__ = "testing" __pattern__ = r'(?:jd|pys?)://.+' @@ -30,41 +29,36 @@ class Http(Hoster): url = re.sub(r'^(jd|py)', "http", pyfile.url) netloc = urlparse.urlparse(url).netloc - link = self.is_download(url) + link = self.isdownload(url) if not link: return for _i in xrange(2): - try: - self.download(link, ref=False, disposition=True) + self.download(link, ref=False, disposition=True) - except BadHeader, e: - if e.code in (404, 410): - self.offline() + if self.req.code in (404, 410): + self.offline() - elif e.code in (401, 403): - self.log_debug("Auth required", "Received HTTP status code: %d" % e.code) + elif self.req.code in (401, 403): + self.log_debug("Auth required", "Received HTTP status code: %d" % e.code) - #@TODO: Recheck in 0.4.10 - if self.account: - servers = [x['login'] for x in self.account.getAllAccounts()] - else: - servers = [] + #@TODO: Recheck in 0.4.10 + if self.account: + servers = [x['login'] for x in self.account.getAllAccounts()] + else: + servers = [] - if netloc in servers: - self.log_debug("Logging on to %s" % netloc) - self.req.addAuth(self.account.get_login('password')) + if netloc in servers: + self.log_debug("Logging on to %s" % netloc) + self.req.addAuth(self.account.get_login('password')) - else: - pwd = self.get_password() - if ':' in pwd: - self.req.addAuth(pwd) - else: - self.fail(_("Authorization required")) else: - self.fail(e) - + pwd = self.get_password() + if ':' in pwd: + self.req.addAuth(pwd) + else: + self.fail(_("Authorization required")) else: break diff --git a/module/plugins/hoster/Share4WebCom.py b/module/plugins/hoster/Share4WebCom.py index fa4861a89..f8d8a52d6 100644 --- a/module/plugins/hoster/Share4WebCom.py +++ b/module/plugins/hoster/Share4WebCom.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.hoster.UnibytesCom import UnibytesCom -from module.plugins.internal.SimpleHoster import create_getInfo +from module.plugins.hoster.UnibytesCom import UnibytesCom, create_getInfo class Share4WebCom(UnibytesCom): diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharing.py index 8721aae3a..89b58bb7f 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharing.py @@ -5,8 +5,8 @@ import re from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class XFileSharingPro(XFSHoster): - __name__ = "XFileSharingPro" +class XFileSharing(XFSHoster): + __name__ = "XFileSharing" __type__ = "hoster" __version__ = "0.57" __status__ = "testing" @@ -14,7 +14,7 @@ class XFileSharingPro(XFSHoster): __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,63}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)' __config__ = [("activated", "bool", "Activated", True)] - __description__ = """XFileSharingPro dummy hoster plugin for hook""" + __description__ = """XFileSharing dummy hoster plugin for hook""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] @@ -23,10 +23,8 @@ class XFileSharingPro(XFSHoster): def _log(self, level, plugintype, pluginname, messages): - return super(XFileSharingPro, self)._log(level, - plugintype, - "%s: %s" % (pluginname, self.PLUGIN_NAME), - messages) + messages = (self.PLUGIN_NAME,) + messages + return self.plugin._log(level, plugintype, pluginname, messages) def init(self): @@ -72,4 +70,4 @@ class XFileSharingPro(XFSHoster): self.account = False -getInfo = create_getInfo(XFileSharingPro) +getInfo = create_getInfo(XFileSharing) |