diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-05-17 11:31:34 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-05-17 11:31:34 +0200 |
| commit | d83ac6e2bc33b312d6e8a650dcc8c0a2f05c94c5 (patch) | |
| tree | 57746172c59689d2f8fc28e76147a5f1f6a11610 /module/plugins | |
| parent | CzshareCom: no relogin (diff) | |
| parent | Merge pull request #126 from stefanos/patch-1 (diff) | |
| download | pyload-d83ac6e2bc33b312d6e8a650dcc8c0a2f05c94c5.tar.xz | |
Merge branch 'stable' of https://github.com/pyload/pyload into stable
Diffstat (limited to 'module/plugins')
| -rwxr-xr-x | module/plugins/hooks/Captcha9kw.py | 15 | ||||
| -rw-r--r-- | module/plugins/hoster/UploadheroCom.py | 6 |
2 files changed, 15 insertions, 6 deletions
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 != ""):
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) |