From 16a9b2221f656134d8cf7220e280caa7be6cdfa3 Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 16 May 2013 22:57:13 +0300 Subject: UploadheroCom: fixed #125 --- module/plugins/hoster/UploadheroCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index eb7b5fb23..502f849af 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -22,8 +22,8 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadheroCom(SimpleHoster): __name__ = "UploadheroCom" __type__ = "hoster" - __pattern__ = r"http://(?:www\.)?uploadhero\.com/dl/\w+" - __version__ = "0.12" + __pattern__ = r"http://(?:www\.)?uploadhero\.com?/dl/\w+" + __version__ = "0.13" __description__ = """UploadHero.com plugin""" __author_name__ = ("mcmyst", "zoidberg") __author_mail__ = ("mcmyst@hotmail.fr", "zoidberg@mujmail.cz") @@ -81,4 +81,4 @@ class UploadheroCom(SimpleHoster): self.wait() self.retry() -getInfo = create_getInfo(UploadheroCom) \ No newline at end of file +getInfo = create_getInfo(UploadheroCom) -- cgit v1.2.3 From e5a6c25ed0f99375d00af67d32982cceede64bfe Mon Sep 17 00:00:00 2001 From: stefanos Date: Fri, 17 May 2013 06:05:14 +0300 Subject: Update Captcha9kw.py prio, captcha per hour, max. timeout to 9kw with faster check (every second, max. timeout is unchanged => setWaiting), confirm captcha and https --- module/plugins/hooks/Captcha9kw.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py index a01ce9576..bb2b8c862 100755 --- a/module/plugins/hooks/Captcha9kw.py +++ b/module/plugins/hooks/Captcha9kw.py @@ -30,17 +30,22 @@ from module.plugins.Hook import Hook class Captcha9kw(Hook): __name__ = "Captcha9kw" - __version__ = "0.03" + __version__ = "0.04" __description__ = """send captchas to 9kw.eu""" __config__ = [("activated", "bool", "Activated", True), ("force", "bool", "Force CT even if client is connected", True), + ("https", "bool", "Enable HTTPS", "False"), + ("confirm", "bool", "Confirm Captcha", "False"), + ("captchaperhour", "int", "Captcha per hour", "9999"), + ("prio", "int", "Prio (1-10)", "0"), ("passkey", "password", "API key", ""),] __author_name__ = ("RaNaN") __author_mail__ = ("RaNaN@pyload.org") - API_URL = "http://www.9kw.eu/index.cgi" + API_URL = "://www.9kw.eu/index.cgi" def setup(self): + self.API_URL = "https"+self.API_URL if self.getConfig("https") else "http"+self.API_URL self.info = {} def getCredits(self): @@ -68,6 +73,10 @@ class Captcha9kw(Hook): response = getURL(self.API_URL, post = { "apikey": self.getConfig("passkey"), + "prio": self.getConfig("prio"), + "confirm": self.getConfig("confirm"), + "captchaperhour": self.getConfig("captchaperhour"), + "maxtimeout": "220", "pyload": "1", "source": "pyload", "base64": "1", @@ -78,7 +87,7 @@ class Captcha9kw(Hook): if response.isdigit(): self.logInfo(_("NewCaptchaID from upload: %s : %s" % (response,task.captchaFile))) - for i in range(1, 200, 2): + for i in range(1, 220, 1): response2 = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "id": response,"pyload": "1","source": "pyload", "action": "usercaptchacorrectdata" }) if(response2 != ""): -- cgit v1.2.3