diff options
Diffstat (limited to 'module/plugins/hoster/RapidgatorNet.py')
| -rw-r--r-- | module/plugins/hoster/RapidgatorNet.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 150aec221..27fb4fda0 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -1,20 +1,21 @@ # -*- coding: utf-8 -*- -import pycurl import re -from module.plugins.internal.utils import json +import pycurl + from module.network.HTTPRequest import BadHeader from module.plugins.captcha.AdsCaptcha import AdsCaptcha from module.plugins.captcha.ReCaptcha import ReCaptcha from module.plugins.captcha.SolveMedia import SolveMedia -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.SimpleHoster import SimpleHoster +from module.plugins.internal.misc import json class RapidgatorNet(SimpleHoster): __name__ = "RapidgatorNet" __type__ = "hoster" - __version__ = "0.38" + __version__ = "0.39" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' @@ -72,19 +73,19 @@ class RapidgatorNet(SimpleHoster): get={'sid': self.sid, 'url': self.pyfile.url}) self.log_debug("API:%s" % cmd, html, "SID: %s" % self.sid) - jso = json.loads(html) - status = jso['response_status'] - msg = jso['response_details'] + json_data = json.loads(html) + status = json_data['response_status'] + msg = json_data['response_details'] except BadHeader, e: self.log_error("API: %s" % cmd, e, "SID: %s" % self.sid) status = e.code msg = e - if status == 200: - return jso['response'] + if status is 200: + return json_data['response'] - elif status == 423: + elif status is 423: self.account.empty() self.retry() @@ -149,9 +150,10 @@ class RapidgatorNet(SimpleHoster): def handle_captcha(self): for klass in (AdsCaptcha, ReCaptcha, SolveMedia): - inst = klass(self) - if inst.detect_key(): - return inst + captcha = klass(self.pyfile) + if captcha.detect_key(): + self.captcha = captcha + return captcha def get_json_response(self, url): @@ -160,6 +162,3 @@ class RapidgatorNet(SimpleHoster): self.retry() self.log_debug(url, res) return json.loads(res) - - -getInfo = create_getInfo(RapidgatorNet) |