diff options
Diffstat (limited to 'module/plugins/hoster')
| -rw-r--r-- | module/plugins/hoster/NitroflareCom.py | 18 | ||||
| -rw-r--r-- | module/plugins/hoster/OneFichierCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/RapidgatorNet.py | 14 |
3 files changed, 21 insertions, 15 deletions
diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index 3e2970985..e08c0e603 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster class NitroflareCom(SimpleHoster): __name__ = "NitroflareCom" __type__ = "hoster" - __version__ = "0.19" + __version__ = "0.21" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' @@ -23,7 +23,8 @@ class NitroflareCom(SimpleHoster): __license__ = "GPLv3" __authors__ = [("sahil" , "sahilshekhawat01@gmail.com"), ("Walter Purcaro", "vuolter@gmail.com" ), - ("Stickell" , "l.stickell@yahoo.it" )] + ("Stickell" , "l.stickell@yahoo.it" ), + ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")] INFO_PATTERN = r'title="(?P<N>.+?)".+>(?P<S>[\d.,]+) (?P<U>[\w^_]+)' OFFLINE_PATTERN = r'>File doesn\'t exist' @@ -39,18 +40,20 @@ class NitroflareCom(SimpleHoster): def handle_free(self, pyfile): #: Used here to load the cookies which will be required later + self.load("http://nitroflare.com/ajax/setCookie.php", post={'fileId': self.info['pattern']['ID']}) + self.load(pyfile.url, post={'goToFreePage': ""}) - self.load("http://nitroflare.com/ajax/setCookie.php", post={'fileId': self.info['pattern']['ID']}) self.data = self.load("http://nitroflare.com/ajax/freeDownload.php", - post={'method': "startTimer", 'fileId': self.info['pattern']['ID']}) + post={'method': "startTimer", + 'fileId': self.info['pattern']['ID']}) self.check_errors() try: js_file = self.load("http://nitroflare.com/js/downloadFree.js?v=1.0.1") - var_time = re.search("var time = (\\d+);", js_file) - wait_time = int(var_time.groups()[0]) + var_time = re.search(r'var time = (\d+);', js_file).group(1) + wait_time = int(var_time) except Exception: wait_time = 60 @@ -65,4 +68,7 @@ class NitroflareCom(SimpleHoster): 'recaptcha_challenge_field': challenge, 'recaptcha_response_field' : response}) + if "The captcha wasn't entered correctly" in self.data: + self.retry_captcha() + return super(NitroflareCom, self).handle_free(pyfile) diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 51caaa657..e84a1a34b 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.misc import format_exc class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "1.00" + __version__ = "1.01" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(?:es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?' @@ -40,7 +40,7 @@ class OneFichierCom(SimpleHoster): NAME_PATTERN = r'>File\s*Name :</td>\s*<td.*>(?P<N>.+?)<' SIZE_PATTERN = r'>Size :</td>\s*<td.*>(?P<S>[\d.,]+) (?P<U>[\w^_]+)' - OFFLINE_PATTERN = r'File not found !\s*<' + OFFLINE_PATTERN = r'(?:File not found !\s*<)|(?:>The requested file has been deleted following an abuse request\.<)' LINK_PATTERN = r'<a href="(.+?)".*>Click here to download the file</a>' WAIT_PATTERN = r'>You must wait \d+ minutes' diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 52aab2411..3b11e1dc8 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -15,7 +15,7 @@ from module.plugins.internal.misc import json, seconds_to_midnight class RapidgatorNet(SimpleHoster): __name__ = "RapidgatorNet" __type__ = "hoster" - __version__ = "0.42" + __version__ = "0.43" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' @@ -27,10 +27,11 @@ class RapidgatorNet(SimpleHoster): __description__ = """Rapidgator.net hoster plugin""" __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("chrox", None), - ("stickell", "l.stickell@yahoo.it"), - ("Walter Purcaro", "vuolter@gmail.com")] + __authors__ = [("zoidberg", "zoidberg@mujmail.cz" ), + ("chrox", None ), + ("stickell", "l.stickell@yahoo.it" ), + ("Walter Purcaro", "vuolter@gmail.com" ), + ("GammaCode", "nitzo2001[AT]yahoo[DOT]com")] API_URL = "http://rapidgator.net/api/file" @@ -86,8 +87,7 @@ class RapidgatorNet(SimpleHoster): return json_data['response'] elif status == 423: - self.account.empty() - self.retry() + self.restart(msg=json_data['response_details'], premium=False) else: self.account.relogin() |