From 43745ae28780d413c2497e3ad06213ec526e643f Mon Sep 17 00:00:00 2001 From: Stefano Date: Mon, 25 Nov 2013 03:18:00 -0800 Subject: Merge pull request #397 from vuolter/s/hoster/BayfilesCom BayfilesCom: Patterns updated(cherry picked from commit f0bd802e38dabc7ce321e58bf6be50eea98ee8b7) --- pyload/plugins/hoster/BayfilesCom.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pyload/plugins') diff --git a/pyload/plugins/hoster/BayfilesCom.py b/pyload/plugins/hoster/BayfilesCom.py index a696bac26..a7a2c75d4 100644 --- a/pyload/plugins/hoster/BayfilesCom.py +++ b/pyload/plugins/hoster/BayfilesCom.py @@ -26,11 +26,11 @@ from module.common.json_layer import json_loads class BayfilesCom(SimpleHoster): __name__ = "BayfilesCom" __type__ = "hoster" - __pattern__ = r"http://(?:www\.)?bayfiles\.(?:com|net)/file/\w+/\w+/.*" - __version__ = "0.05" + __pattern__ = r"https?://(?:www\.)?bayfiles\.(com|net)/file/(?P[a-zA-Z0-9]+/[a-zA-Z0-9]+/[^/]+)" + __version__ = "0.06" __description__ = """Bayfiles.com plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = ("zoidberg", "Walter Purcaro") + __author_mail__ = ("zoidberg@mujmail.cz", "vuolter@gmail.com") FILE_INFO_PATTERN = r'

[^<]*(?P[0-9., ]+)(?P[kKMG])i?B

' FILE_OFFLINE_PATTERN = r'(

The requested file could not be found.

|404 Not Found)' @@ -53,7 +53,7 @@ class BayfilesCom(SimpleHoster): self.parseError('VARS') vfid, delay = found.groups() - response = json_loads(self.load('http://bayfiles.com/ajax_download', get={ + response = json_loads(self.load('https://bayfiles.com/ajax_download', get={ "_": time() * 1000, "action": "startTimer", "vfid": vfid}, decode=True)) @@ -64,12 +64,12 @@ class BayfilesCom(SimpleHoster): self.setWait(int(delay)) self.wait() - self.html = self.load('http://bayfiles.com/ajax_download', get={ + self.html = self.load('https://bayfiles.com/ajax_download', get={ "token": response['token'], "action": "getLink", "vfid": vfid}) - # Get final link and download + # Get final link and download found = re.search(self.LINK_PATTERN, self.html) if not found: self.parseError("Free link") @@ -90,9 +90,9 @@ class BayfilesCom(SimpleHoster): "notfound": re.compile(r"404 Not Found") }) if check == "waitforfreeslots": - self.retry(60, 300, "Wait for free slot") + self.retry(30, 60 * 5, "Wait for free slot") elif check == "notfound": - self.retry(60, 300, "404 Not found") + self.retry(30, 60 * 5, "404 Not found") getInfo = create_getInfo(BayfilesCom) -- cgit v1.2.3