From f16590e26254b5a39ecbc36b4ac0fa1951d12389 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Fri, 3 Jun 2016 15:31:59 +0300 Subject: [UpdateManager] Bugfix --- module/plugins/hooks/UpdateManager.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index 3cb325d29..504b1e353 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -15,7 +15,7 @@ from module.plugins.internal.misc import encode, exists, Expose, fsjoin, threade class UpdateManager(Addon): __name__ = "UpdateManager" __type__ = "hook" - __version__ = "1.13" + __version__ = "1.14" __status__ = "testing" __config__ = [("activated" , "bool", "Activated" , True ), @@ -164,19 +164,22 @@ class UpdateManager(Addon): self.info['pyload'] = False self.info['last_check'] = time.time() - if not newversion or not re.search(r'^\d+(?:\.\d+){0,3}[a-z]?$', newversion): + if not newversion: exitcode = 0 elif newversion == "None": self.log_info(_("pyLoad is up to date!")) exitcode = self.update_plugins() - else: + elif re.search(r'^\d+(?:\.\d+){0,3}[a-z]?$', newversion): self.log_info(_("*** New pyLoad %s available ***") % newversion) self.log_info(_("*** Get it here: https://github.com/pyload/pyload/releases ***")) self.info['pyload'] = True exitcode = 3 + else: + exitcode = 0 + #: Exit codes: #: -1 = No plugin updated, new pyLoad version available #: 0 = No plugin updated -- cgit v1.2.3 From fea41bc098a04c6021e273846bdfa0805c5bc05e Mon Sep 17 00:00:00 2001 From: Nitzo Date: Fri, 3 Jun 2016 22:50:03 +0300 Subject: [UlozTo] Fix #2486 --- module/plugins/accounts/UlozTo.py | 6 +++--- module/plugins/hoster/UlozTo.py | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index da3bb6f0c..e5c4b81da 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -23,7 +23,7 @@ class UlozTo(Account): def grab_info(self, user, password, data): - html = self.load("http://www.ulozto.net/") + html = self.load("https://www.ulozto.net/") m = re.search(self.TRAFFIC_LEFT_PATTERN, html) @@ -34,11 +34,11 @@ class UlozTo(Account): def signin(self, user, password, data): - login_page = self.load('http://www.ulozto.net/?do=web-login') + login_page = self.load('https://www.ulozto.net/?do=web-login') action = re.findall('
\w+/[^/?]*)' + __pattern__ = r'https?://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl|pornfile\.cz)/(?:live/)?(?P\w+/[^/?]*)' __config__ = [("activated" , "bool", "Activated" , True), @@ -37,7 +37,8 @@ class UlozTo(SimpleHoster): SIZE_PATTERN = r'.*?(?P[\d.,]+\s[kMG]?B)' OFFLINE_PATTERN = r'404 - Page not found|

File (has been deleted|was banned)

' - URL_REPLACEMENTS = [(r'(?<=http://)([^/]+)', "www.ulozto.net")] + URL_REPLACEMENTS = [(r'(?<=http://)([^/]+)', "www.ulozto.net"), + ("http://", "https://")] SIZE_REPLACEMENTS = [(r'([\d.]+)\s([kMG])B', convert_decimal_prefix)] CHECK_TRAFFIC = True @@ -60,8 +61,9 @@ class UlozTo(SimpleHoster): self.log_info(_("Adult content confirmation needed")) url = pyfile.url.replace("ulozto.net", "pornfile.cz") - self.load("http://pornfile.cz/porn-disclaimer", - post={'agree': "Confirm", 'do': 'pornDisclaimer-submit'}) + self.load("https://pornfile.cz/porn-disclaimer", + post={'agree': "Confirm", + 'do' : "pornDisclaimer-submit"}) html = self.load(url) name = re.search(self.NAME_PATTERN, html).group(2) @@ -81,7 +83,7 @@ class UlozTo(SimpleHoster): #: Old version - last seen 9.12.2013 self.log_debug('Using "old" version') - captcha_value = self.captcha.decrypt("http://img.uloz.to/captcha/%s.png" % inputs['captcha_id']) + captcha_value = self.captcha.decrypt("https://img.uloz.to/captcha/%s.png" % inputs['captcha_id']) self.log_debug("CAPTCHA ID: " + inputs['captcha_id'] + ", CAPTCHA VALUE: " + captcha_value) inputs.update({'captcha_id': inputs['captcha_id'], 'captcha_key': inputs['captcha_key'], 'captcha_value': captcha_value}) @@ -90,10 +92,10 @@ class UlozTo(SimpleHoster): #: New version - better to get new parameters (like captcha reload) because of image url - since 6.12.2013 self.log_debug('Using "new" version') - xapca = self.load("http://www.ulozto.net/reloadXapca.php", + xapca = self.load("https://www.ulozto.net/reloadXapca.php", get={'rnd': timestamp()}) - xapca = xapca.replace('sound":"', 'sound":"http:').replace('image":"', 'image":"http:') + xapca = xapca.replace('sound":"', 'sound":"https:').replace('image":"', 'image":"https:') self.log_debug("xapca: %s" % xapca) data = json.loads(xapca) @@ -116,7 +118,7 @@ class UlozTo(SimpleHoster): else: self.error(_("CAPTCHA form changed")) - self.download("http://www.ulozto.net" + action, post=inputs) + self.download("https://www.ulozto.net" + action, post=inputs) def handle_premium(self, pyfile): @@ -131,7 +133,8 @@ class UlozTo(SimpleHoster): self.log_info(_("Password protected link, trying ") + password) self.data = self.load(self.pyfile.url, get={'do': "passwordProtectedForm-submit"}, - post={'password': password, 'password_send': 'Send'}) + post={'password' : password, + 'password_send': 'Send'}) if self.PASSWD_PATTERN in self.data: self.fail(_("Wrong password")) @@ -139,7 +142,7 @@ class UlozTo(SimpleHoster): self.fail(_("No password found")) if re.search(self.VIPLINK_PATTERN, self.data): - self.data = self.load(pyfile.url, get={'disclaimer': "1"}) + self.data = self.load(self.pyfile.url, get={'disclaimer': "1"}) return super(UlozTo, self).check_errors() @@ -149,7 +152,7 @@ class UlozTo(SimpleHoster): 'wrong_captcha': ">An error ocurred while verifying the user", 'offline' : re.compile(self.OFFLINE_PATTERN), 'passwd' : self.PASSWD_PATTERN, - 'server_error' : 'src="http://img.ulozto.cz/error403/vykricnik.jpg"', #: Paralell dl, server overload etc. + 'server_error' : 'src="https://img.ulozto.cz/error403/vykricnik.jpg"', #: Paralell dl, server overload etc. 'not_found' : "Ulož.to" }) -- cgit v1.2.3 From 4b6af37368898ff60ca5fae1bde293bb41033bc3 Mon Sep 17 00:00:00 2001 From: Nitzo Date: Fri, 3 Jun 2016 22:51:36 +0300 Subject: [UlozTo] Version up --- module/plugins/accounts/UlozTo.py | 2 +- module/plugins/hoster/UlozTo.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index e5c4b81da..a712ea551 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class UlozTo(Account): __name__ = "UlozTo" __type__ = "account" - __version__ = "0.17" + __version__ = "0.18" __status__ = "testing" __description__ = """Uloz.to account plugin""" diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py index 6c88c7289..478758492 100644 --- a/module/plugins/hoster/UlozTo.py +++ b/module/plugins/hoster/UlozTo.py @@ -14,7 +14,7 @@ def convert_decimal_prefix(m): class UlozTo(SimpleHoster): __name__ = "UlozTo" __type__ = "hoster" - __version__ = "1.32" + __version__ = "1.33" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl|pornfile\.cz)/(?:live/)?(?P\w+/[^/?]*)' -- cgit v1.2.3 From 64917a9bf552ef3a499730a945312e764aca03b9 Mon Sep 17 00:00:00 2001 From: Nitzo Date: Sun, 5 Jun 2016 00:24:05 +0300 Subject: [FilerNet] Fix #2489 --- module/plugins/hoster/FilerNet.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index a1ad5d8c9..cc4788772 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -32,7 +32,7 @@ class FilerNet(SimpleHoster): INFO_PATTERN = r'

Free Download (?P\S+) (?P[\w.]+) (?P[\w^_]+)

' OFFLINE_PATTERN = r'Nicht gefunden' - WAIT_PATTERN = r'musst du (\d+)' + WAIT_PATTERN = r'var count = (\d+);' LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'href="([^"]+)">Get download' @@ -51,10 +51,7 @@ class FilerNet(SimpleHoster): self.captcha = ReCaptcha(pyfile) response, challenge = self.captcha.challenge() - header = self.load(pyfile.url, - post={'recaptcha_challenge_field': challenge, - 'recaptcha_response_field' : response, - 'hash' : inputs['hash']}, - just_header=True) - - self.link = header.get('location') + self.download(pyfile.url, + post={'recaptcha_challenge_field': challenge, + 'recaptcha_response_field' : response, + 'hash' : inputs['hash']}) -- cgit v1.2.3