summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/FshareVn.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-07 01:23:55 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-07 01:23:55 +0200
commitb1759bc440cd6013837697eb8de540914f693ffd (patch)
treed170caf63d7f65e44d23ea2d91a65759a1665928 /module/plugins/hoster/FshareVn.py
parent[Plugin] Fix decoding in load method (diff)
downloadpyload-b1759bc440cd6013837697eb8de540914f693ffd.tar.xz
No camelCase style anymore
Diffstat (limited to 'module/plugins/hoster/FshareVn.py')
-rw-r--r--module/plugins/hoster/FshareVn.py26
1 files changed, 13 insertions, 13 deletions
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 '<ul class="message-error">' in self.html:
msg = "Unknown error occured or wait time not parsed"
- self.logError(msg)
+ self.log_error(msg)
self.retry(30, 2 * 60, msg)
self.info.pop('error', None)