summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/hoster/FshareVn.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugins/hoster/FshareVn.py')
-rw-r--r--pyload/plugins/hoster/FshareVn.py47
1 files changed, 25 insertions, 22 deletions
diff --git a/pyload/plugins/hoster/FshareVn.py b/pyload/plugins/hoster/FshareVn.py
index 3ecae0394..92f7c659a 100644
--- a/pyload/plugins/hoster/FshareVn.py
+++ b/pyload/plugins/hoster/FshareVn.py
@@ -10,14 +10,11 @@ from pyload.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)
+ html = getURL("http://www.fshare.vn/check_link.php",
+ post={'action': "check_link", 'arrlinks': url},
+ decode=True)
- file_info = parseFileInfo(FshareVn, url, html)
-
- yield file_info
+ yield parseFileInfo(FshareVn, url, html)
def doubleDecode(m):
@@ -25,20 +22,21 @@ def doubleDecode(m):
class FshareVn(SimpleHoster):
- __name__ = "FshareVn"
- __type__ = "hoster"
- __version__ = "0.16"
+ __name__ = "FshareVn"
+ __type__ = "hoster"
+ __version__ = "0.17"
- __pattern__ = r'http://(?:www\.)?fshare.vn/file/.*'
+ __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.*'
__description__ = """FshareVn hoster plugin"""
- __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+ __license__ = "GPLv3"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
- FILE_INFO_PATTERN = r'<p>(?P<N>[^<]+)<\\/p>[\\trn\s]*<p>(?P<S>[0-9,.]+)\s*(?P<U>[kKMG])i?B<\\/p>'
+ INFO_PATTERN = r'<p>(?P<N>[^<]+)<\\/p>[\\trn\s]*<p>(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)<\\/p>'
OFFLINE_PATTERN = r'<div class=\\"f_left file_w\\"|<\\/p>\\t\\t\\t\\t\\r\\n\\t\\t<p><\\/p>\\t\\t\\r\\n\\t\\t<p>0 KB<\\/p>'
- FILE_NAME_REPLACEMENTS = [("(.*)", doubleDecode)]
+ NAME_REPLACEMENTS = [("(.*)", doubleDecode)]
LINK_PATTERN = r'action="(http://download.*?)[#"]'
WAIT_PATTERN = ur'Lượt tải xuống kế tiếp là:\s*(.*?)\s*<'
@@ -57,6 +55,7 @@ class FshareVn(SimpleHoster):
self.handleFree()
self.checkDownloadedFile()
+
def handleFree(self):
self.html = self.load(self.pyfile.url, decode=True)
@@ -66,16 +65,16 @@ class FshareVn(SimpleHoster):
self.url = self.pyfile.url + action
if not inputs:
- self.parseError('FORM')
+ self.error(_("No FORM"))
elif 'link_file_pwd_dl' in inputs:
for password in self.getPassword().splitlines():
- self.logInfo("Password protected link, trying", password)
+ self.logInfo(_("Password protected link, trying ") + password)
inputs['link_file_pwd_dl'] = password
self.html = self.load(self.url, post=inputs, decode=True)
if not 'name="link_file_pwd_dl"' in self.html:
break
else:
- self.fail("No or incorrect password")
+ self.fail(_("No or incorrect password"))
else:
self.html = self.load(self.url, post=inputs, decode=True)
@@ -86,29 +85,33 @@ class FshareVn(SimpleHoster):
m = re.search(self.LINK_PATTERN, self.html)
if m is None:
- self.parseError('FREE DL URL')
+ self.error(_("LINK_PATTERN not found"))
self.url = m.group(1)
self.logDebug("FREE DL URL: %s" % self.url)
self.wait()
self.download(self.url)
+
def handlePremium(self):
self.download(self.pyfile.url)
+
def checkErrors(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.logInfo(_("Wait until %s ICT") % m.group(1))
wait_until = mktime(strptime(m.group(1), "%d/%m/%Y %H:%M"))
self.wait(wait_until - mktime(gmtime()) - 7 * 60 * 60, True)
self.retry()
elif '<ul class="message-error">' in self.html:
- self.logError("Unknown error occured or wait time not parsed")
- self.retry(30, 2 * 60, "Unknown error")
+ msg = "Unknown error occured or wait time not parsed"
+ self.logError(msg)
+ self.retry(30, 2 * 60, msg)
+
def checkDownloadedFile(self):
# check download
@@ -117,4 +120,4 @@ class FshareVn(SimpleHoster):
})
if check == "not_found":
- self.fail("File not m on server")
+ self.fail(_("File not m on server"))