diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | .hgignore | 36 | ||||
| -rw-r--r-- | module/plugins/accounts/ShareonlineBiz.py | 7 | ||||
| -rw-r--r-- | module/plugins/crypter/LinkCryptWs.py | 5 | ||||
| -rw-r--r-- | module/plugins/crypter/ShareLinksBiz.py | 9 |
5 files changed, 15 insertions, 50 deletions
diff --git a/.gitignore b/.gitignore index 52c616991..96eddfd8e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,10 @@ qt.conf UnRAR_license.txt -tesseract
\ No newline at end of file +/*/ +!/docs +!/icons +!/locale +!/module +!/scripts +!/tests diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 1215b241d..000000000 --- a/.hgignore +++ /dev/null @@ -1,36 +0,0 @@ -# ignoreing unneeded files, using glob syntax -syntax: glob -*.pyc -*~ -*.pidaproject -.svn -*.DS_Store -*.egg-info -*.project -*.pydevproject -Downloads/* -container/* -Logs/* -docs/module/ -docs/_build -module/plugins/container/DLC_*.py -failed_links.txt -module/config/gui.xml -module/config/core.xml -module/config/plugin.xml -links.txt -ssl.crt -ssl.key -cert.pem -module/web/pyload.db -*.svg -*.prefs -*.po -*.orig -*.rej -pyload/* -dist/* -build/* -setup.py -paver-minilib.zip -env/* diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 400552d5c..47f6043dc 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -9,7 +9,7 @@ from module.plugins.internal.utils import set_cookie class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.42" + __version__ = "0.43" __status__ = "testing" __description__ = """Share-online.biz account plugin""" @@ -32,11 +32,6 @@ class ShareonlineBiz(Account): if not 'a' in api: self.fail_login(res.strip('*')) -# Since api['a'] always returns 'not_available' for Shareonline, uncommented this for the time being. -# Resolves the problem that the log always says 'Could not login user | No info available'. -# if api['a'].lower() == "not_available": -# self.fail_login(_("No info available")) - return api diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index be6200ba9..9d421ad03 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -14,7 +14,7 @@ from module.plugins.internal.utils import html_unescape class LinkCryptWs(Crypter): __name__ = "LinkCryptWs" __type__ = "crypter" - __version__ = "0.14" + __version__ = "0.15" __status__ = "testing" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)' @@ -24,7 +24,8 @@ class LinkCryptWs(Crypter): __license__ = "GPLv3" __authors__ = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"), ("glukgluk", None), - ("Gummibaer", None)] + ("Gummibaer", None), + ("Arno-Nymous", None)] CRYPTED_KEY = "crypted" diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 80aeb430a..e2ddfd926 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -11,7 +11,7 @@ from module.plugins.internal.Crypter import Crypter, create_getInfo class ShareLinksBiz(Crypter): __name__ = "ShareLinksBiz" __type__ = "crypter" - __version__ = "1.21" + __version__ = "1.22" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' @@ -22,14 +22,14 @@ class ShareLinksBiz(Crypter): __description__ = """Share-Links.biz decrypter plugin""" __license__ = "GPLv3" - __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es")] + __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"), + ("Arno-Nymous", None)] def setup(self): self.base_url = None self.file_id = None self.package = None - self.captcha = False def decrypt(self, pyfile): @@ -49,7 +49,6 @@ class ShareLinksBiz(Crypter): self.handle_errors() if self.is_captcha_protected(): - self.captcha = True self.unlock_captcha_protection() self.handle_errors() @@ -139,7 +138,7 @@ class ShareLinksBiz(Crypter): captchaUrl = 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(captchaUrl, input_type="gif", output_type='positional') - self.log_debug("Captcha resolved, coords %s" % coords) + self.log_debug("Captcha resolved! Coords: {}, {}".format(*coords)) #: Resolve captcha href = self._resolve_coords(coords, captchaMap) |