diff options
Diffstat (limited to 'module/plugins/crypter/RelinkUs.py')
| -rw-r--r-- | module/plugins/crypter/RelinkUs.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index ea0ce6072..c15ecd8d6 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -3,12 +3,13 @@ from __future__ import with_statement import binascii -import re import os +import re from Crypto.Cipher import AES -from module.plugins.internal.Crypter import Crypter -from module.utils import save_join as fs_join + +from module.plugins.internal.Crypter import Crypter, create_getInfo +from module.plugins.internal.utils import fs_join class RelinkUs(Crypter): @@ -18,7 +19,7 @@ class RelinkUs(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' - __config__ = [("activated", "bool", "Activated", True), + __config__ = [("activated" , "bool", "Activated" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] @@ -144,7 +145,7 @@ class RelinkUs(Crypter): self.log_debug("Request user positional captcha resolving") captcha_img_url = self.CAPTCHA_IMG_URL + "?id=%s" % self.fileid coords = self.captcha.decrypt(captcha_img_url, input_type="png", output_type='positional', ocr="CircleCaptcha") - self.log_debug("Captcha resolved, coords [%s]" % str(coords)) + self.log_debug("Captcha resolved, coords %s" % coords) captcha_post_url = self.CAPTCHA_SUBMIT_URL + "?id=%s" % self.fileid captcha_post_data = {'button.x': coords[0], 'button.y': coords[1], 'captcha': 'submit'} self.html = self.load(captcha_post_url, post=captcha_post_data) @@ -291,3 +292,6 @@ class RelinkUs(Crypter): #: Log and return self.log_debug("Package has %d links" % len(links)) return links + + +getInfo = create_getInfo(RelinkUs) |