From e9525741306111eb61502255c629753b46e0fb22 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Wed, 9 Dec 2015 23:21:44 +0200 Subject: [ShareonlineBiz] version up --- module/plugins/hoster/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index 24c25a43a..06c9f6cfe 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ShareonlineBiz(SimpleHoster): __name__ = "ShareonlineBiz" __type__ = "hoster" - __version__ = "0.63" + __version__ = "0.64" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P\w+)' -- cgit v1.2.3 From 57b9320a21f981b8f7e47885b0901ea5ace39237 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Tue, 15 Dec 2015 02:49:11 +0200 Subject: [OneFichierCom] fix #2193 --- module/plugins/hoster/OneFichierCom.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index b657fe484..53ebaa759 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -9,10 +9,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.95" + __version__ = "0.96" __status__ = "testing" - __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?' + __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(?:es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?' __config__ = [("activated" , "bool", "Activated" , True), ("use_premium" , "bool", "Use premium account if available" , True), ("fallback" , "bool", "Fallback to free download if premium fails" , True), @@ -28,7 +28,8 @@ class OneFichierCom(SimpleHoster): ("stickell", "l.stickell@yahoo.it"), ("Elrick69", "elrick69[AT]rocketmail[DOT]com"), ("Walter Purcaro", "vuolter@gmail.com"), - ("Ludovic Lehmann", "ludo.lehmann@gmail.com")] + ("Ludovic Lehmann", "ludo.lehmann@gmail.com"), + ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")] URL_REPLACEMENTS = [("https:", "http:")] #@TODO: Remove in 0.4.10 @@ -41,9 +42,8 @@ class OneFichierCom(SimpleHoster): WAIT_PATTERN = r'>You must wait \d+ minutes' - def setup(self): - self.multiDL = self.premium + self.multiDL = self.premium self.resume_download = True @@ -96,11 +96,11 @@ class OneFichierCom(SimpleHoster): inputs['submit'] = "Download" - self.download(url, post=inputs) + self.download(url, post=inputs, disposition=False) #@TODO: Remove disposition in 0.4.10 def handle_premium(self, pyfile): - self.download(pyfile.url, post={'did': 0, 'dl_no_ssl': "on"}) + self.download(pyfile.url, post={'did': 0, 'dl_no_ssl': "on"}, disposition=False) #@TODO: Remove disposition in 0.4.10 getInfo = create_getInfo(OneFichierCom) -- cgit v1.2.3 From 5338e1e5ec7086874a1bd7d36d905e589f3ff871 Mon Sep 17 00:00:00 2001 From: igel-kun Date: Thu, 17 Dec 2015 16:55:05 +0100 Subject: various fixes - had to introduce the ```self.retry``` on line 86 because Upstore sometimes just restarted the timer on some files without any reason. - removed artifact config options - now catches "LONG_WAIT" events - proper error checking with ```check_errors()``` --- module/plugins/hoster/UpstoreNet.py | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py index c863dff9d..90b921c0a 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -9,16 +9,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UpstoreNet(SimpleHoster): __name__ = "UpstoreNet" __type__ = "hoster" - __version__ = "0.09" + __version__ = "0.10" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?upstore\.net/' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium" , "bool", "Use premium account if available" , True), - ("fallback" , "bool", "Fallback to free download if premium fails" , True), - ("chk_filesize", "bool", "Check file size" , True), - ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] - __description__ = """Upstore.Net File Download Hoster""" __license__ = "GPLv3" __authors__ = [("igel", "igelkun@myopera.com")] @@ -27,9 +21,12 @@ class UpstoreNet(SimpleHoster): INFO_PATTERN = r'
.*?
\s*\n

(?P.*?)

\s*\n
\s*\n\s*(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'File not found' + LONG_WAIT_PATTERN = r'You should wait (\d+) min. before downloading next' WAIT_PATTERN = r'var sec = (\d+)' CHASH_PATTERN = r'' LINK_FREE_PATTERN = r'' + WRONG_CAPTCHA_PATTERN = r'Wrong captcha' + PREMIUM_ONLY_PATTERN = r'available only for Premium' def handle_free(self, pyfile): @@ -42,6 +39,7 @@ class UpstoreNet(SimpleHoster): #: Continue to stage2 post_data = {'hash': chash, 'free': 'Slow download'} self.data = self.load(pyfile.url, post=post_data) + self.check_errors() #: STAGE 2: solv captcha and wait #: First get the infos we need: recaptcha key and wait time @@ -64,13 +62,31 @@ class UpstoreNet(SimpleHoster): self.data = self.load(pyfile.url, post=post_data) - #: STAGE 3: get direct link + # check whether the captcha was wrong + m = re.search(self.WRONG_CAPTCHA_PATTERN, self.data, re.S) + if m is not None: + continue + + + # STAGE 3: get direct link or wait time + m = re.search(self.LONG_WAIT_PATTERN, self.data, re.S) + if m is not None: + wait_time = 60* int(m.group(1)) + self.wantReconnect = True + self.retry(wait_time=wait_time, reason=_("Please wait to download this file")) + m = re.search(self.LINK_FREE_PATTERN, self.data, re.S) if m is not None: + self.link = m.group(1) break - if m is not None: - self.link = m.group(1) + # sometimes, upstore just restarts the countdown without saying anything... + # in this case we'll just wait 1h and retry + self.wantReconnect = True + self.retry(wait_time=3600, reason=_("Upstore doesn't like us today")) + + getInfo = create_getInfo(UpstoreNet) + -- cgit v1.2.3 From 32ca40415a2e07d649fe65267d6ccc73598f869a Mon Sep 17 00:00:00 2001 From: igel-kun Date: Thu, 17 Dec 2015 17:05:44 +0100 Subject: Update UpstoreNet.py --- module/plugins/hoster/UpstoreNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py index 90b921c0a..4fcf6dcfa 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -73,7 +73,7 @@ class UpstoreNet(SimpleHoster): if m is not None: wait_time = 60* int(m.group(1)) self.wantReconnect = True - self.retry(wait_time=wait_time, reason=_("Please wait to download this file")) + self.retry(wait=wait_time, reason=_("Please wait to download this file")) m = re.search(self.LINK_FREE_PATTERN, self.data, re.S) if m is not None: -- cgit v1.2.3 From 95834c1f3cecff658f8ece24b3196377cebd1b7f Mon Sep 17 00:00:00 2001 From: Richard Lindner Date: Sun, 20 Dec 2015 08:52:30 +0100 Subject: Fix: OneFichier free download had a new link to follow --- module/plugins/hoster/OneFichierCom.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 53ebaa759..bd3a44bf5 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -96,7 +96,14 @@ class OneFichierCom(SimpleHoster): inputs['submit'] = "Download" - self.download(url, post=inputs, disposition=False) #@TODO: Remove disposition in 0.4.10 + self.data = self.load(url, post=inputs) + match = re.search(r'Click here to download the file', self.data) + if match: + url = match.group(1) + self.download(url) + else: + self.log_error("Could not find download link") + def handle_premium(self, pyfile): -- cgit v1.2.3 From dea05ac7a4cd2bddcf2ce8311601dbd1f9add010 Mon Sep 17 00:00:00 2001 From: Richard Lindner Date: Sun, 20 Dec 2015 09:13:22 +0100 Subject: Same fix better implementation --- module/plugins/hoster/OneFichierCom.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index bd3a44bf5..a40278477 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -41,6 +41,7 @@ class OneFichierCom(SimpleHoster): OFFLINE_PATTERN = r'File not found !\s*<' WAIT_PATTERN = r'>You must wait \d+ minutes' + LINK_FREE_PATTERN = r'Click here to download the file' def setup(self): self.multiDL = self.premium @@ -97,13 +98,7 @@ class OneFichierCom(SimpleHoster): inputs['submit'] = "Download" self.data = self.load(url, post=inputs) - match = re.search(r'Click here to download the file', self.data) - if match: - url = match.group(1) - self.download(url) - else: - self.log_error("Could not find download link") - + return super(OneFichierCom, self).handle_free(pyfile) def handle_premium(self, pyfile): -- cgit v1.2.3 From 009bfc30738d88248eace98238ac121ae54e70cd Mon Sep 17 00:00:00 2001 From: Richard Lindner Date: Sun, 20 Dec 2015 09:58:25 +0100 Subject: Fix: Nitroflare cannot be handled as Direct Download --- module/plugins/hoster/NitroflareCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index 7970ae460..9ca6ab187 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -29,6 +29,7 @@ class NitroflareCom(SimpleHoster): OFFLINE_PATTERN = r'>File doesn\'t exist' LINK_PREMIUM_PATTERN = LINK_FREE_PATTERN = r'(https?://[\w\-]+\.nitroflare\.com/.+?)"' + DIRECT_LINK = False RECAPTCHA_KEY = "6Lenx_USAAAAAF5L1pmTWvWcH73dipAEzNnmNLgy" PREMIUM_ONLY_PATTERN = r'This file is available with Premium only' -- cgit v1.2.3 From 0837578fa037fe96ecb292221da7cd777e5e03c4 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Sun, 20 Dec 2015 16:29:21 +0200 Subject: [OneFichierCom] fix #2196 --- module/plugins/hoster/OneFichierCom.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index a40278477..ef6f49da3 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.96" + __version__ = "0.97" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(?:es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?' @@ -31,17 +31,18 @@ class OneFichierCom(SimpleHoster): ("Ludovic Lehmann", "ludo.lehmann@gmail.com"), ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")] + DISPOSITION = False #@TODO: Remove disposition in 0.4.10 URL_REPLACEMENTS = [("https:", "http:")] #@TODO: Remove in 0.4.10 - COOKIES = [("1fichier.com", "LG", "en")] + COOKIES = [("1fichier.com", "LG", "en")] - NAME_PATTERN = r'>File\s*Name :\s*(?P.+?)<' - SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' - OFFLINE_PATTERN = r'File not found !\s*<' + NAME_PATTERN = r'>File\s*Name :\s*(?P.+?)<' + SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' + OFFLINE_PATTERN = r'File not found !\s*<' + LINK_PATTERN = r'Click here to download the file' - WAIT_PATTERN = r'>You must wait \d+ minutes' - LINK_FREE_PATTERN = r'Click here to download the file' + WAIT_PATTERN = r'>You must wait \d+ minutes' def setup(self): self.multiDL = self.premium @@ -53,7 +54,7 @@ class OneFichierCom(SimpleHoster): redirect = url for i in xrange(10): try: - headers = dict(re.findall(r"(?P.+?): (?P.+?)\r?\n", get_url(redirect, just_header=True).lower())) + headers = dict((k.lower(), v) for k,v in re.findall(r"(?P.+?): (?P.+?)\r?\n", get_url(redirect, just_header=True))) if 'location' in headers and headers['location']: redirect = headers['location'] else: @@ -95,14 +96,16 @@ class OneFichierCom(SimpleHoster): if "pass" in inputs: inputs['pass'] = self.get_password() - inputs['submit'] = "Download" + inputs['dl_no_ssl'] = "on" - self.data = self.load(url, post=inputs) - return super(OneFichierCom, self).handle_free(pyfile) + self.data=self.load(url, post=inputs) + + m = re.search(self.LINK_PATTERN, self.data) + if m: + self.link = m.group(1) def handle_premium(self, pyfile): self.download(pyfile.url, post={'did': 0, 'dl_no_ssl': "on"}, disposition=False) #@TODO: Remove disposition in 0.4.10 -getInfo = create_getInfo(OneFichierCom) -- cgit v1.2.3 From 693aa1c0df858d1771e907d4c0368b2fc003b20e Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Mon, 21 Dec 2015 02:30:06 +0200 Subject: [UgouploadNet] new hoster fix #2201 --- module/plugins/hoster/UgouploadNet.py | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 module/plugins/hoster/UgouploadNet.py (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/UgouploadNet.py b/module/plugins/hoster/UgouploadNet.py new file mode 100644 index 000000000..6e76a22fd --- /dev/null +++ b/module/plugins/hoster/UgouploadNet.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- + +import re + +from module.plugins.captcha.ReCaptcha import ReCaptcha +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class UgouploadNet(SimpleHoster): + __name__ = "UgouploadNet" + __type__ = "hoster" + __version__ = "0.01" + __status__ = "testing" + + __pattern__ = r'https?://(?:www)?\.ugoupload\.net/\w{4}/.+' + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), + ("fallback" , "bool", "Fallback to free download if premium fails" , True), + ("chk_filesize", "bool", "Check file size" , True), + ("max_wait" , "int" , "Reconnect if waiting time is greater than minutes", 10 )] + + __description__ = """ugoupload.net hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")] + + + NAME_PATTERN = r'
(.+?)
' + SIZE_PATTERN = r'\((?P[\d.,]+) (?P[\w^_]+)\)
' + + WAIT_PATTERN = r'var seconds = (\d+);' + LINK_FREE_PATTERN = r" Date: Mon, 21 Dec 2015 02:58:31 +0200 Subject: [UgouploadNet] update --- module/plugins/hoster/UgouploadNet.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/UgouploadNet.py b/module/plugins/hoster/UgouploadNet.py index 6e76a22fd..fec2e11d1 100644 --- a/module/plugins/hoster/UgouploadNet.py +++ b/module/plugins/hoster/UgouploadNet.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UgouploadNet(SimpleHoster): __name__ = "UgouploadNet" __type__ = "hoster" - __version__ = "0.01" + __version__ = "0.02" __status__ = "testing" __pattern__ = r'https?://(?:www)?\.ugoupload\.net/\w{4}/.+' @@ -39,6 +39,9 @@ class UgouploadNet(SimpleHoster): def handle_free(self, pyfile): + if self.req.code == 404: + self.offline() + self.check_errors() m = re.search(self.LINK_FREE_PATTERN, self.data) @@ -47,7 +50,7 @@ class UgouploadNet(SimpleHoster): response, challenge = recaptcha.challenge(self.RECAPTCHA_KEY) self.download(m.group(1), post={'recaptcha_challenge_field': challenge, - 'recaptcha_response_field': response, - 'submit': "Submit", - 'submitted': "1", - 'd': "1"}) + 'recaptcha_response_field': response, + 'submit': "Submit", + 'submitted': "1", + 'd': "1"}) -- cgit v1.2.3