From 7151f580f5f85b1dcb9e4c0907073adf7ae36e81 Mon Sep 17 00:00:00 2001 From: Stefano Date: Fri, 13 Sep 2013 17:20:37 +0200 Subject: RyushareCom: fixed #251 + updated test link --- module/plugins/hoster/RyushareCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/RyushareCom.py') diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py index b53614e78..4733015ec 100644 --- a/module/plugins/hoster/RyushareCom.py +++ b/module/plugins/hoster/RyushareCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Test links (random.bin): -# http://ryushare.com/v3u21arv593q/random.bin +# http://ryushare.com/denawy6x6tzz/random.bin import re @@ -13,7 +13,7 @@ class RyushareCom(XFileSharingPro): __name__ = "RyushareCom" __type__ = "hoster" __pattern__ = r"http://(?:\w*\.)*?ryushare.com/\w{11,}" - __version__ = "0.12" + __version__ = "0.13" __description__ = """ryushare.com hoster plugin""" __author_name__ = ("zoidberg", "stickell","quareevo") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it","quareevo@arcor.de") @@ -21,7 +21,7 @@ class RyushareCom(XFileSharingPro): HOSTER_NAME = "ryushare.com" WAIT_PATTERN = r'You have to wait ((?P\d+) hour[s]?, )?((?P\d+) minute[s], )?(?P\d+) second[s]' - DIRECT_LINK_PATTERN = r'Click here to download' + DIRECT_LINK_PATTERN = r'(http://([^/]*?ryushare.com|\d+\.\d+\.\d+\.\d+)(:\d+/d/|/files/\w+/\w+/)[^"\'<]+)' SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"' def setup(self): @@ -83,7 +83,7 @@ class RyushareCom(XFileSharingPro): self.fail("You have entered 5 invalid captcha codes") if 'Click here to download' in self.html: - m = re.search(self.DIRECT_LINK_PATTERN, self.html) + m = re.search(r'Click here to download', self.html) return m.group(1) getInfo = create_getInfo(RyushareCom) -- cgit v1.2.3