From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/hoster/FshareVn.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'module/plugins/hoster/FshareVn.py') diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py index 50128db10..717265014 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -11,8 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo def getInfo(urls): for url in urls: html = getURL("http://www.fshare.vn/check_link.php", - post={'action': "check_link", 'arrlinks': url}, - decode=True) + post={'action': "check_link", 'arrlinks': url}) yield parseFileInfo(FshareVn, url, html) @@ -45,15 +44,11 @@ class FshareVn(SimpleHoster): def preload(self): self.html = self.load("http://www.fshare.vn/check_link.php", - post={'action': "check_link", 'arrlinks': pyfile.url}, - decode=True) - - if isinstance(self.TEXT_ENCODING, basestring): - self.html = unicode(self.html, self.TEXT_ENCODING) + post={'action': "check_link", 'arrlinks': pyfile.url}) def handleFree(self, pyfile): - self.html = self.load(pyfile.url, decode=True) + self.html = self.load(pyfile.url) self.checkErrors() @@ -69,7 +64,7 @@ class FshareVn(SimpleHoster): if password: self.logInfo(_("Password protected link, trying ") + password) inputs['link_file_pwd_dl'] = password - self.html = self.load(url, post=inputs, decode=True) + self.html = self.load(url, post=inputs) if 'name="link_file_pwd_dl"' in self.html: self.fail(_("Incorrect password")) @@ -77,7 +72,7 @@ class FshareVn(SimpleHoster): self.fail(_("No password found")) else: - self.html = self.load(url, post=inputs, decode=True) + self.html = self.load(url, post=inputs) self.checkErrors() -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/hoster/FshareVn.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'module/plugins/hoster/FshareVn.py') diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py index 717265014..7e1d573d8 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -8,7 +8,7 @@ from module.network.RequestFactory import getURL from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo -def getInfo(urls): +def get_info(urls): for url in urls: html = getURL("http://www.fshare.vn/check_link.php", post={'action': "check_link", 'arrlinks': url}) @@ -16,14 +16,14 @@ def getInfo(urls): yield parseFileInfo(FshareVn, url, html) -def doubleDecode(m): +def double_decode(m): return m.group(1).decode('raw_unicode_escape') class FshareVn(SimpleHoster): __name__ = "FshareVn" __type__ = "hoster" - __version__ = "0.20" + __version__ = "0.21" __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -47,22 +47,22 @@ class FshareVn(SimpleHoster): post={'action': "check_link", 'arrlinks': pyfile.url}) - def handleFree(self, pyfile): + def handle_free(self, pyfile): self.html = self.load(pyfile.url) - self.checkErrors() + self.check_errors() - action, inputs = self.parseHtmlForm('frm_download') + action, inputs = self.parse_html_form('frm_download') url = urlparse.urljoin(pyfile.url, action) if not inputs: self.error(_("No FORM")) elif 'link_file_pwd_dl' in inputs: - password = self.getPassword() + password = self.get_password() if password: - self.logInfo(_("Password protected link, trying ") + password) + self.log_info(_("Password protected link, trying ") + password) inputs['link_file_pwd_dl'] = password self.html = self.load(url, post=inputs) @@ -74,10 +74,10 @@ class FshareVn(SimpleHoster): else: self.html = self.load(url, post=inputs) - self.checkErrors() + self.check_errors() m = re.search(r'var count = (\d+)', self.html) - self.setWait(int(m.group(1)) if m else 30) + self.set_wait(int(m.group(1)) if m else 30) m = re.search(self.LINK_FREE_PATTERN, self.html) if m is None: @@ -87,19 +87,19 @@ class FshareVn(SimpleHoster): self.wait() - def checkErrors(self): + def check_errors(self): if '/error.php?' in self.req.lastEffectiveURL or u"Liên kết bạn chọn không tồn" in self.html: self.offline() m = re.search(self.WAIT_PATTERN, self.html) if m: - self.logInfo(_("Wait until %s ICT") % m.group(1)) + self.log_info(_("Wait until %s ICT") % m.group(1)) wait_until = time.mktime.time(time.strptime.time(m.group(1), "%d/%m/%Y %H:%M")) self.wait(wait_until - time.mktime.time(time.gmtime.time()) - 7 * 60 * 60, True) self.retry() elif '