summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter/LinkdecrypterCom.py
diff options
context:
space:
mode:
authorGravatar jansohn <jansohn@users.noreply.github.com> 2015-10-02 10:09:26 +0200
committerGravatar jansohn <jansohn@users.noreply.github.com> 2015-10-02 10:09:26 +0200
commit3a08656c5665f4b8db98744fb323e64b8630e084 (patch)
tree28f9f62ffc57888b76ca32540dbf5af3a4cfc8d0 /module/plugins/crypter/LinkdecrypterCom.py
parentMerge pull request #1 from pyload/stable (diff)
parent[Account] Improve parse_traffic method + code cosmetics (diff)
downloadpyload-3a08656c5665f4b8db98744fb323e64b8630e084.tar.xz
Merge pull request #2 from pyload/stable
sync with stable
Diffstat (limited to 'module/plugins/crypter/LinkdecrypterCom.py')
-rw-r--r--module/plugins/crypter/LinkdecrypterCom.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index d8812dbd5..c16ec0b6e 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.MultiCrypter import MultiCrypter
class LinkdecrypterCom(MultiCrypter):
__name__ = "LinkdecrypterCom"
__type__ = "crypter"
- __version__ = "0.32"
+ __version__ = "0.33"
__status__ = "testing"
__pattern__ = r'^unmatchable$'
@@ -28,7 +28,6 @@ class LinkdecrypterCom(MultiCrypter):
def setup(self):
- self.password = self.get_password()
self.req.setOption("timeout", 300)
@@ -40,11 +39,11 @@ class LinkdecrypterCom(MultiCrypter):
while retries:
m = re.search(self.TEXTAREA_PATTERN, self.html, re.S)
- if m:
+ if m is not None:
self.urls = [x for x in m.group(1).splitlines() if '[LINK-ERROR]' not in x]
m = re.search(self.CAPTCHA_PATTERN, self.html)
- if m:
+ if m is not None:
captcha_url = 'http://linkdecrypter.com/' + m.group(1)
result_type = "positional" if "getPos" in m.group(2) else "textual"
@@ -61,7 +60,8 @@ class LinkdecrypterCom(MultiCrypter):
elif self.PASSWORD_PATTERN in self.html:
if self.password:
self.log_info(_("Password protected link"))
- self.html = self.load('http://linkdecrypter.com/', post={'password': self.password})
+ self.html = self.load('http://linkdecrypter.com/',
+ post={'password': self.get_password()})
else:
self.fail(_("Missing password"))