diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2015-01-31 03:45:19 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2015-01-31 03:45:19 +0100 |
| commit | ddccf7b36d7a941e4ab5539ff0c35b1367fe5337 (patch) | |
| tree | d9f72e4b42429cdc62fdfc1052c4ad7dde8802c5 /module | |
| parent | Merge pull request #1111 from zapp-brannigan/patch-4 (diff) | |
| download | pyload-ddccf7b36d7a941e4ab5539ff0c35b1367fe5337.tar.xz | |
[ExtractArchive] Fix typo
Fix https://github.com/pyload/pyload/issues/1011#issuecomment-72268195, https://github.com/pyload/pyload/issues/1113, https://github.com/pyload/pyload/issues/1115
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/hooks/ExtractArchive.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/CaptchaService.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index c91228850..f1b73bf5f 100644 --- a/module/plugins/hooks/ExtractArchive.py +++ b/module/plugins/hooks/ExtractArchive.py @@ -62,11 +62,11 @@ class ArchiveQueue(object): def get(self): - return self.plugin.getStorage("ExtractArchive:%s" % storage, []) + return self.plugin.getStorage("ExtractArchive:%s" % self.storage, []) def set(self, value): - return self.plugin.setStorage("ExtractArchive:%s" % storage, value) + return self.plugin.setStorage("ExtractArchive:%s" % self.storage, value) def clean(self): @@ -91,7 +91,7 @@ class ArchiveQueue(object): class ExtractArchive(Hook): __name__ = "ExtractArchive" __type__ = "hook" - __version__ = "1.13" + __version__ = "1.14" __config__ = [("activated" , "bool" , "Activated" , True ), ("fullpath" , "bool" , "Extract full path" , True ), diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py index c7dab2a0a..45672ce70 100644 --- a/module/plugins/internal/CaptchaService.py +++ b/module/plugins/internal/CaptchaService.py @@ -190,7 +190,7 @@ class ReCaptcha(CaptchaService): token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html) self.plugin.logDebug("ReCaptcha token #1: %s" % token1.group(1)) - + html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame", get={'c' : token1.group(1), 'hl' : language, @@ -214,7 +214,7 @@ class ReCaptcha(CaptchaService): token4 = re.search(r'"rresp","(.*?)",', html) self.plugin.logDebug("ReCaptcha token #4: %s" % token4.group(1)) - + millis_captcha_loading = int(round(time.time() * 1000)) captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload", get={'c':token4.group(1), 'k':key}, forceUser=True) |