diff options
Diffstat (limited to 'module/plugins/crypter')
| -rw-r--r-- | module/plugins/crypter/ShareLinksBiz.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index f766c86dd..3d67d3791 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -11,7 +11,7 @@ from module.plugins.internal.Crypter import Crypter class ShareLinksBiz(Crypter): __name__ = "ShareLinksBiz" __type__ = "crypter" - __version__ = "1.25" + __version__ = "1.26" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' @@ -143,7 +143,7 @@ class ShareLinksBiz(Crypter): captcha_url = self.base_url + '/captcha.gif?d=%s&PHPSESSID=%s' % (m.group(1), m.group(2)) self.log_debug(_("Waiting user for correct position")) coords = self.captcha.decrypt(captcha_url, input_type="gif", output_type='positional') - self.log_debug(_("Captcha resolved! Coords: *s, %s") % (coords[0], coords[1])) + self.log_debug(_("Captcha resolved! Coords: %s, %s") % (coords[0], coords[1])) #: Resolve captcha href = self._resolve_coords(coords, captcha_map) @@ -236,6 +236,8 @@ class ShareLinksBiz(Crypter): except Exception, detail: self.log_debug(_("Error decrypting Web link [%s], %s") % (ID, detail)) + self.log_debug(_("%s links") % len(pack_links)) + return pack_links @@ -243,12 +245,18 @@ class ShareLinksBiz(Crypter): pack_links = [] self.log_debug(_("Handling Container links")) - pattern = r'javascript:_get\(\'(.*?)\', 0, \'(rsdf|ccf|dlc)\'\)' + pattern = r'javascript:_get\(\'(.+?)\', 0, \'(rsdf|ccf|dlc)\'\)' + containers_links = re.findall(pattern, self.data) + self.log_debug(_("Decrypting %d Container links") % len(containers_links)) + for container_link in containers_links: link = "%s/get/%s/%s" % (self.base_url, container_link[1], container_link[0]) pack_links.append(link) + + self.log_debug(_("%s links") % len(pack_links)) + return pack_links @@ -264,6 +272,8 @@ class ShareLinksBiz(Crypter): except Exception: self.fail(_("Unable to decrypt CNL2 links")) + self.log_debug(_("%s links") % len(pack_links)) + return pack_links |