From 93592862b520a862c01f80c019e5c4bc43746c19 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 5 Jul 2014 16:54:20 +0200 Subject: [SimpleHoster] Better inline docs + changed "FILE_OFFLINE_PATTERN" to "OFFLINE_PATTERN" --- module/plugins/hoster/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 41f3e4b11..2c842d77b 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -20,7 +20,7 @@ class OneFichierCom(SimpleHoster): FILE_NAME_PATTERN = r'">Filename :\s*(?P[^<]+)' FILE_SIZE_PATTERN = r'Size :\s*(?P[^<]+)' - FILE_OFFLINE_PATTERN = r'The (requested)? file (could not be found|has been deleted)' + OFFLINE_PATTERN = r'The (requested)? file (could not be found|has been deleted)' FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] -- cgit v1.2.3 From 04038a2cf0c4c2d9cc9a0c8e8bf9beb6426afae8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 10 Jul 2014 03:02:26 +0200 Subject: Use parseError instead PluginParseError + unified all download pattern attributes as LINK_PATTERN + removed some old patterns (not used anymore) + other code cosmetics --- module/plugins/hoster/OneFichierCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 2c842d77b..2d539f851 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -24,8 +24,8 @@ class OneFichierCom(SimpleHoster): FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] - WAITING_PATTERN = "Warning ! Without premium status, you must wait between each downloads" - NOT_PARALLEL = r"Warning ! Without premium status, you can download only one file at a time" + WAITING_PATTERN = r'Warning ! Without premium status, you must wait between each downloads' + NOT_PARALLEL = r'Warning ! Without premium status, you can download only one file at a time' WAIT_TIME = 10 * 60 # Retry time between each free download RETRY_TIME = 15 * 60 # Default retry time in seconds (if detected parallel download) -- cgit v1.2.3 From 5060e4c6374a5116d0d8b02528f910f8c5f8bcf9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:25:41 +0200 Subject: Fix code indentation, some bad whitespaces and missing authors + use 'not' instead 'is None' + replace __pattern__'s r" with r' + other minor cosmetics --- module/plugins/hoster/OneFichierCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 2d539f851..e43f807a2 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -83,4 +83,5 @@ class OneFichierCom(SimpleHoster): self.retry() + getInfo = create_getInfo(OneFichierCom) -- cgit v1.2.3 From 9395182da7afed55a29bde1c7cbefe4204e783f0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 20 Jul 2014 03:02:09 +0200 Subject: Store all re.search/match object as "m" instead "found" --- module/plugins/hoster/OneFichierCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index e43f807a2..2a98a97dc 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -40,8 +40,8 @@ class OneFichierCom(SimpleHoster): self.logInfo('You have to wait been each free download! Retrying in %d seconds.' % self.WAIT_TIME) self.waitAndRetry(self.WAIT_TIME) else: # detect parallel download - found = re.search(self.NOT_PARALLEL, self.html) - if found: + m = re.search(self.NOT_PARALLEL, self.html) + if m: self.waitAndRetry(self.RETRY_TIME) url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['id']) -- cgit v1.2.3 From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 Aug 2014 19:35:59 +0200 Subject: Remove trailing whitespaces + remove license headers + import urllib methods directly + sort and fix key attributes + use save_join instead join + sort some import declarations + other minor code cosmetics --- module/plugins/hoster/OneFichierCom.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 2a98a97dc..0536f7185 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- - -# Test links (random.bin): +# +# Test links: # http://5pnm24ltcw.1fichier.com/ import re @@ -11,8 +11,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __pattern__ = r'(http://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl.fr))/?' __version__ = "0.61" + + __pattern__ = r'(http://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl.fr))/?' + __description__ = """1fichier.com hoster plugin""" __author_name__ = ("fragonib", "the-razer", "zoidberg", "imclem", "stickell", "Elrick69") __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "daniel_ AT gmx DOT net", "zoidberg@mujmail.cz", @@ -29,6 +31,7 @@ class OneFichierCom(SimpleHoster): WAIT_TIME = 10 * 60 # Retry time between each free download RETRY_TIME = 15 * 60 # Default retry time in seconds (if detected parallel download) + def setup(self): self.multiDL = self.premium self.resumeDownload = True @@ -48,14 +51,14 @@ class OneFichierCom(SimpleHoster): if not url: self.parseError("Download link not found") - # Check for protection + # Check for protection if "pass" in inputs: inputs['pass'] = self.getPassword() inputs['submit'] = "Download" self.download(url, post=inputs) - # Check download + # Check download self.checkDownloadedFile() def handlePremium(self): -- cgit v1.2.3 From 0d220d634e512d89bda540f91c643b361c82ea8a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 27 Sep 2014 01:38:32 +0200 Subject: Logging string cosmetics --- module/plugins/hoster/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 0536f7185..8a962d062 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -40,7 +40,7 @@ class OneFichierCom(SimpleHoster): self.html = self.load(self.pyfile.url, decode=True) if self.WAITING_PATTERN in self.html: - self.logInfo('You have to wait been each free download! Retrying in %d seconds.' % self.WAIT_TIME) + self.logInfo("You have to wait been each free download! Retrying in %d seconds." % self.WAIT_TIME) self.waitAndRetry(self.WAIT_TIME) else: # detect parallel download m = re.search(self.NOT_PARALLEL, self.html) -- cgit v1.2.3 From 01c5c24e6aa993b2060618e244f47a476725657d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 1 Oct 2014 04:45:27 +0200 Subject: [OneFichierCom] Fixed wait pattern + code optimizations --- module/plugins/hoster/OneFichierCom.py | 56 +++++++++++++++------------------- 1 file changed, 25 insertions(+), 31 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 8a962d062..984e2bb2d 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -# -# Test links: -# http://5pnm24ltcw.1fichier.com/ import re @@ -13,41 +10,39 @@ class OneFichierCom(SimpleHoster): __type__ = "hoster" __version__ = "0.61" - __pattern__ = r'(http://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl.fr))/?' + __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' __description__ = """1fichier.com hoster plugin""" __author_name__ = ("fragonib", "the-razer", "zoidberg", "imclem", "stickell", "Elrick69") __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "daniel_ AT gmx DOT net", "zoidberg@mujmail.cz", "imclem on github", "l.stickell@yahoo.it", "elrick69[AT]rocketmail[DOT]com") - FILE_NAME_PATTERN = r'">Filename :\s*(?P[^<]+)' - FILE_SIZE_PATTERN = r'Size :\s*(?P[^<]+)' - OFFLINE_PATTERN = r'The (requested)? file (could not be found|has been deleted)' - FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] + FILE_NAME_PATTERN = r'>Filename :\s*(?P.+?)<' + FILE_SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P\w+)' + OFFLINE_PATTERN = r'>The (requested)? file (could not be found|has been deleted)' - WAITING_PATTERN = r'Warning ! Without premium status, you must wait between each downloads' - NOT_PARALLEL = r'Warning ! Without premium status, you can download only one file at a time' - WAIT_TIME = 10 * 60 # Retry time between each free download - RETRY_TIME = 15 * 60 # Default retry time in seconds (if detected parallel download) + FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/')] + COOKIES = [(".1fichier.com", "LG", "en")] + + WAIT_PATTERN = r'>You must wait (\d+)' def setup(self): - self.multiDL = self.premium + self.multiDL = True self.resumeDownload = True + def handleFree(self): self.html = self.load(self.pyfile.url, decode=True) - - if self.WAITING_PATTERN in self.html: - self.logInfo("You have to wait been each free download! Retrying in %d seconds." % self.WAIT_TIME) - self.waitAndRetry(self.WAIT_TIME) - else: # detect parallel download - m = re.search(self.NOT_PARALLEL, self.html) - if m: - self.waitAndRetry(self.RETRY_TIME) - - url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['id']) + m = re.search(self.WAIT_PATTERN, self.html) + if m: + time = int(m.group(1)) + 1 * 60 #: One minute more than what the page displays to be safe + self.logInfo("You have to wait been each free download", "Retrying in %d minutes." % minutes) + self.wait(time, True) + self.retry() + + url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) if not url: self.parseError("Download link not found") @@ -61,8 +56,9 @@ class OneFichierCom(SimpleHoster): # Check download self.checkDownloadedFile() + def handlePremium(self): - url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['id']) + url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) if not url: self.parseError("Download link not found") @@ -76,15 +72,13 @@ class OneFichierCom(SimpleHoster): # Check download self.checkDownloadedFile() + def checkDownloadedFile(self): - check = self.checkDownload({"wait": self.WAITING_PATTERN}) + check = self.checkDownload({'wait': self.WAIT_PATTERN}) if check == "wait": - self.waitAndRetry(int(self.lastcheck.group(1)) * 60) - - def waitAndRetry(self, wait_time): - self.wait(wait_time, True) - self.retry() - + time = int(self.lastcheck.group(1)) * 60 + self.wait(time, True) + self.retry() getInfo = create_getInfo(OneFichierCom) -- cgit v1.2.3 From a9df6627d1df9786a47cd7cdc834dd4e509a9208 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 1 Oct 2014 04:53:19 +0200 Subject: [OneFichierCom] Bump version number --- module/plugins/hoster/OneFichierCom.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 984e2bb2d..fc40a1874 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.61" + __version__ = "0.62" __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' @@ -22,8 +22,7 @@ class OneFichierCom(SimpleHoster): FILE_SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P\w+)' OFFLINE_PATTERN = r'>The (requested)? file (could not be found|has been deleted)' - FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/')] - COOKIES = [(".1fichier.com", "LG", "en")] + FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] WAIT_PATTERN = r'>You must wait (\d+)' -- cgit v1.2.3 From e5e233b45f2ce7bc98618d61d1b75bce34d4add4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 1 Oct 2014 23:28:59 +0200 Subject: [OneFichierCom] Fix typo --- module/plugins/hoster/OneFichierCom.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index fc40a1874..6cec7a9c4 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.62" + __version__ = "0.63" __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' @@ -28,7 +28,7 @@ class OneFichierCom(SimpleHoster): def setup(self): - self.multiDL = True + self.multiDL = self.premium self.resumeDownload = True @@ -36,9 +36,9 @@ class OneFichierCom(SimpleHoster): self.html = self.load(self.pyfile.url, decode=True) m = re.search(self.WAIT_PATTERN, self.html) if m: - time = int(m.group(1)) + 1 * 60 #: One minute more than what the page displays to be safe - self.logInfo("You have to wait been each free download", "Retrying in %d minutes." % minutes) - self.wait(time, True) + wait_time = int(m.group(1)) + 1 * 60 #: One minute more than what the page displays to be safe + self.logInfo("You have to wait been each free download", "Retrying in %d minutes." % wait_time) + self.wait(wait_time, True) self.retry() url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) @@ -75,8 +75,8 @@ class OneFichierCom(SimpleHoster): def checkDownloadedFile(self): check = self.checkDownload({'wait': self.WAIT_PATTERN}) if check == "wait": - time = int(self.lastcheck.group(1)) * 60 - self.wait(time, True) + wait_time = int(self.lastcheck.group(1)) * 60 + self.wait(wait_time, True) self.retry() -- cgit v1.2.3 From e17394d4fd0a70369ac424895a56a0b279dc9495 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 2 Oct 2014 21:24:00 +0200 Subject: [OneFichierCom] Fix waiting again --- module/plugins/hoster/OneFichierCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 6cec7a9c4..af5d97878 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.63" + __version__ = "0.64" __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' @@ -36,9 +36,9 @@ class OneFichierCom(SimpleHoster): self.html = self.load(self.pyfile.url, decode=True) m = re.search(self.WAIT_PATTERN, self.html) if m: - wait_time = int(m.group(1)) + 1 * 60 #: One minute more than what the page displays to be safe + wait_time = int(m.group(1)) + 1 #: One minute more than what the page displays to be safe self.logInfo("You have to wait been each free download", "Retrying in %d minutes." % wait_time) - self.wait(wait_time, True) + self.wait(wait_time * 60, True) self.retry() url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) -- cgit v1.2.3 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/hoster/OneFichierCom.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index af5d97878..488b5b479 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -13,9 +13,12 @@ class OneFichierCom(SimpleHoster): __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' __description__ = """1fichier.com hoster plugin""" - __author_name__ = ("fragonib", "the-razer", "zoidberg", "imclem", "stickell", "Elrick69") - __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "daniel_ AT gmx DOT net", "zoidberg@mujmail.cz", - "imclem on github", "l.stickell@yahoo.it", "elrick69[AT]rocketmail[DOT]com") + __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"), + ("the-razer", "daniel_ AT gmx DOT net"), + ("zoidberg", "zoidberg@mujmail.cz"), + ("imclem", None), + ("stickell", "l.stickell@yahoo.it"), + ("Elrick69", "elrick69[AT]rocketmail[DOT]com")] FILE_NAME_PATTERN = r'>Filename :\s*(?P.+?)<' -- cgit v1.2.3 From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 20:18:13 +0200 Subject: Add __license__ key attribute to plugins --- module/plugins/hoster/OneFichierCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 488b5b479..81eff0a27 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -13,6 +13,7 @@ class OneFichierCom(SimpleHoster): __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' __description__ = """1fichier.com hoster plugin""" + __license__ = "GPLv3" __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"), ("the-razer", "daniel_ AT gmx DOT net"), ("zoidberg", "zoidberg@mujmail.cz"), -- cgit v1.2.3 From 388a2f6478d42e423f1f8442d8539983f3762f22 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 14 Oct 2014 13:38:49 +0200 Subject: Improve unit detection in size pattern --- module/plugins/hoster/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 81eff0a27..41a618d13 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -23,7 +23,7 @@ class OneFichierCom(SimpleHoster): FILE_NAME_PATTERN = r'>Filename :\s*(?P.+?)<' - FILE_SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P\w+)' + FILE_SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'>The (requested)? file (could not be found|has been deleted)' FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] -- cgit v1.2.3 From 2ae91b81a2f12a1c9b1f78524df78a2b3f1ef494 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Oct 2014 14:52:42 +0200 Subject: Update hosters to self.error --- module/plugins/hoster/OneFichierCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 41a618d13..e6e193b89 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.64" + __version__ = "0.65" __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' @@ -47,7 +47,7 @@ class OneFichierCom(SimpleHoster): url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) if not url: - self.parseError("Download link not found") + self.error("Download link not found") # Check for protection if "pass" in inputs: @@ -63,7 +63,7 @@ class OneFichierCom(SimpleHoster): def handlePremium(self): url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) if not url: - self.parseError("Download link not found") + self.error("Download link not found") # Check for protection if "pass" in inputs: -- cgit v1.2.3 From 1b096b2eb2634e8dea80b06ab9ecde206b198b35 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 22 Oct 2014 19:47:00 +0200 Subject: Spare code cosmetics --- module/plugins/hoster/OneFichierCom.py | 1 - 1 file changed, 1 deletion(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index e6e193b89..3f3d0a19a 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -37,7 +37,6 @@ class OneFichierCom(SimpleHoster): def handleFree(self): - self.html = self.load(self.pyfile.url, decode=True) m = re.search(self.WAIT_PATTERN, self.html) if m: wait_time = int(m.group(1)) + 1 #: One minute more than what the page displays to be safe -- cgit v1.2.3 From 9f2ebe486a3e155fb6a60e07cccb77ab6a772eb2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 26 Oct 2014 02:31:54 +0200 Subject: Extend translation support in plugins + a lot of code cosmetics and typo fixes --- module/plugins/hoster/OneFichierCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 3f3d0a19a..d7e477356 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -40,13 +40,13 @@ class OneFichierCom(SimpleHoster): m = re.search(self.WAIT_PATTERN, self.html) if m: wait_time = int(m.group(1)) + 1 #: One minute more than what the page displays to be safe - self.logInfo("You have to wait been each free download", "Retrying in %d minutes." % wait_time) + self.logInfo(_("You have to wait been each free download"), _("Retrying in %d minutes") % wait_time) self.wait(wait_time * 60, True) self.retry() url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) if not url: - self.error("Download link not found") + self.error(_("Download link not found")) # Check for protection if "pass" in inputs: @@ -62,7 +62,7 @@ class OneFichierCom(SimpleHoster): def handlePremium(self): url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) if not url: - self.error("Download link not found") + self.error(_("Download link not found")) # Check for protection if "pass" in inputs: -- cgit v1.2.3 From 8b3589dd394d81177bf4680dddb5bdb9506b89ea Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 16:04:10 +0100 Subject: Update plugins to last changes --- module/plugins/hoster/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index d7e477356..b40c45a95 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -39,7 +39,7 @@ class OneFichierCom(SimpleHoster): def handleFree(self): m = re.search(self.WAIT_PATTERN, self.html) if m: - wait_time = int(m.group(1)) + 1 #: One minute more than what the page displays to be safe + wait_time = int(m.group(1)) self.logInfo(_("You have to wait been each free download"), _("Retrying in %d minutes") % wait_time) self.wait(wait_time * 60, True) self.retry() -- cgit v1.2.3 From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/hoster/OneFichierCom.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index b40c45a95..005279a6b 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -6,20 +6,20 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): - __name__ = "OneFichierCom" - __type__ = "hoster" + __name__ = "OneFichierCom" + __type__ = "hoster" __version__ = "0.65" __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' __description__ = """1fichier.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"), - ("the-razer", "daniel_ AT gmx DOT net"), - ("zoidberg", "zoidberg@mujmail.cz"), - ("imclem", None), - ("stickell", "l.stickell@yahoo.it"), - ("Elrick69", "elrick69[AT]rocketmail[DOT]com")] + __license__ = "GPLv3" + __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"), + ("the-razer", "daniel_ AT gmx DOT net"), + ("zoidberg", "zoidberg@mujmail.cz"), + ("imclem", None), + ("stickell", "l.stickell@yahoo.it"), + ("Elrick69", "elrick69[AT]rocketmail[DOT]com")] FILE_NAME_PATTERN = r'>Filename :\s*(?P.+?)<' -- cgit v1.2.3 From 772e47ef806d18fd209e910be0535bce7c07dc7b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Nov 2014 22:47:07 +0100 Subject: Update all other plugins --- module/plugins/hoster/OneFichierCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 005279a6b..1b8be7eed 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -22,11 +22,11 @@ class OneFichierCom(SimpleHoster): ("Elrick69", "elrick69[AT]rocketmail[DOT]com")] - FILE_NAME_PATTERN = r'>Filename :\s*(?P.+?)<' - FILE_SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' + NAME_PATTERN = r'>Filename :\s*(?P.+?)<' + SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'>The (requested)? file (could not be found|has been deleted)' - FILE_URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] + URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] WAIT_PATTERN = r'>You must wait (\d+)' -- cgit v1.2.3 From 711946e300953d5a3535310f8fa3f7db13208ebe Mon Sep 17 00:00:00 2001 From: Thierry Merle Date: Mon, 3 Nov 2014 16:54:24 +0100 Subject: [OneFichier] Plugin update --- module/plugins/hoster/OneFichierCom.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 1b8be7eed..4119a0903 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.65" + __version__ = "0.66" __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' @@ -22,9 +22,9 @@ class OneFichierCom(SimpleHoster): ("Elrick69", "elrick69[AT]rocketmail[DOT]com")] - NAME_PATTERN = r'>Filename :\s*(?P.+?)<' - SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' - OFFLINE_PATTERN = r'>The (requested)? file (could not be found|has been deleted)' + NAME_PATTERN = r'>FileName :\s*(?P.+?)<' + SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' + OFFLINE_PATTERN = r'File not found !\s*<' URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] @@ -44,7 +44,7 @@ class OneFichierCom(SimpleHoster): self.wait(wait_time * 60, True) self.retry() - url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) + url, inputs = self.parseHtmlForm('action="http://1fichier.com/\?%s' % self.info['ID']) if not url: self.error(_("Download link not found")) @@ -60,7 +60,7 @@ class OneFichierCom(SimpleHoster): def handlePremium(self): - url, inputs = self.parseHtmlForm('action="http://%s' % self.file_info['ID']) + url, inputs = self.parseHtmlForm('action="http://1fichier.com/\?%s' % self.info['ID']) if not url: self.error(_("Download link not found")) -- cgit v1.2.3 From 04e18c8c3c286ed4feaac5cc9b016639adc01ed3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 4 Nov 2014 01:08:43 +0100 Subject: [OneFichierCom] Fixed --- module/plugins/hoster/OneFichierCom.py | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 4119a0903..e7ef5b08e 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,9 +8,9 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.66" + __version__ = "0.67" - __pattern__ = r'https?://(?P\w+)\.(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)' + __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)(?:/\?(?P\w+))?' __description__ = """1fichier.com hoster plugin""" __license__ = "GPLv3" @@ -19,14 +19,15 @@ class OneFichierCom(SimpleHoster): ("zoidberg", "zoidberg@mujmail.cz"), ("imclem", None), ("stickell", "l.stickell@yahoo.it"), - ("Elrick69", "elrick69[AT]rocketmail[DOT]com")] + ("Elrick69", "elrick69[AT]rocketmail[DOT]com"), + ("Walter Purcaro", "vuolter@gmail.com")] NAME_PATTERN = r'>FileName :\s*(?P.+?)<' SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'File not found !\s*<' - URL_REPLACEMENTS = [(__pattern__, r'http://\g.\g/en/')] + COOKIES = [(".1fichier.com", "LG", "en")] WAIT_PATTERN = r'>You must wait (\d+)' @@ -44,38 +45,23 @@ class OneFichierCom(SimpleHoster): self.wait(wait_time * 60, True) self.retry() - url, inputs = self.parseHtmlForm('action="http://1fichier.com/\?%s' % self.info['ID']) - if not url: - self.error(_("Download link not found")) - - # Check for protection - if "pass" in inputs: - inputs['pass'] = self.getPassword() - inputs['submit'] = "Download" - - self.download(url, post=inputs) - - # Check download - self.checkDownloadedFile() + return self.handlePremium() def handlePremium(self): - url, inputs = self.parseHtmlForm('action="http://1fichier.com/\?%s' % self.info['ID']) + id = self.info['ID1'] or self.info['ID2'] + url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id) + if not url: self.error(_("Download link not found")) - # Check for protection if "pass" in inputs: inputs['pass'] = self.getPassword() + inputs['submit'] = "Download" self.download(url, post=inputs) - # Check download - self.checkDownloadedFile() - - - def checkDownloadedFile(self): check = self.checkDownload({'wait': self.WAIT_PATTERN}) if check == "wait": wait_time = int(self.lastcheck.group(1)) * 60 -- cgit v1.2.3 From e5ac81e2b1825ede18f0b2eec023a87d98d8fc23 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 4 Nov 2014 13:18:05 +0100 Subject: [OneFichierCom] Update hoster __pattern__ --- module/plugins/hoster/OneFichierCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index e7ef5b08e..336ae08df 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,9 +8,9 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.67" + __version__ = "0.68" - __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P(1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl\.fr)(?:/\?(?P\w+))?' + __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' __description__ = """1fichier.com hoster plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 27bace39e29ac9d032a64fb8e8ad8359791f02e1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 7 Nov 2014 13:47:57 +0100 Subject: [OneFichierCom] Don't use reconnnect --- module/plugins/hoster/OneFichierCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 336ae08df..a7aded001 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.68" + __version__ = "0.69" __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' @@ -65,7 +65,7 @@ class OneFichierCom(SimpleHoster): check = self.checkDownload({'wait': self.WAIT_PATTERN}) if check == "wait": wait_time = int(self.lastcheck.group(1)) * 60 - self.wait(wait_time, True) + self.wait(wait_time, False) #@TODO: Change to self.wait(wait_time, True) i 0.4.10 self.retry() -- cgit v1.2.3 From 0d44375184b6524508117bf31e2bf0a25ca7efe6 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 7 Nov 2014 21:57:33 +0100 Subject: [OneFichierCom] Tryout to fix waiting error --- module/plugins/hoster/OneFichierCom.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index a7aded001..84aa7b8c1 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.69" + __version__ = "0.70" __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' @@ -37,23 +37,21 @@ class OneFichierCom(SimpleHoster): self.resumeDownload = True - def handleFree(self): + def handle(self, reconnect): m = re.search(self.WAIT_PATTERN, self.html) if m: wait_time = int(m.group(1)) - self.logInfo(_("You have to wait been each free download"), _("Retrying in %d minutes") % wait_time) - self.wait(wait_time * 60, True) - self.retry() - return self.handlePremium() + self.logDebug(_("Wait %d minutes") % wait_time) + self.wait(wait_time * 60, reconnect) + self.retry(reason="You have to wait been each free download") - def handlePremium(self): id = self.info['ID1'] or self.info['ID2'] url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id) if not url: - self.error(_("Download link not found")) + self.fail(_("Download link not found")) if "pass" in inputs: inputs['pass'] = self.getPassword() @@ -62,11 +60,13 @@ class OneFichierCom(SimpleHoster): self.download(url, post=inputs) - check = self.checkDownload({'wait': self.WAIT_PATTERN}) - if check == "wait": - wait_time = int(self.lastcheck.group(1)) * 60 - self.wait(wait_time, False) #@TODO: Change to self.wait(wait_time, True) i 0.4.10 - self.retry() + + def handleFree(self): + return self.handle(True) + + + def handlePremium(self): + return self.handle(False) getInfo = create_getInfo(OneFichierCom) -- cgit v1.2.3 From 7a09515ed34a5f5247c10d666ad8b60a5bd4f867 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 8 Nov 2014 12:45:24 +0100 Subject: [OneFichierCom] Temp bugfix --- module/plugins/hoster/OneFichierCom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 84aa7b8c1..b64b1ce7f 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.70" + __version__ = "0.71" __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' @@ -27,6 +27,8 @@ class OneFichierCom(SimpleHoster): SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'File not found !\s*<' + URL_REPLACEMENTS = [(r'(.+/[^?]+)$', "\1\?"), (r'$', "&lg=en")] #@TODO: Remove in 0.4.10 + COOKIES = [(".1fichier.com", "LG", "en")] WAIT_PATTERN = r'>You must wait (\d+)' -- cgit v1.2.3 From cfbce060d6bfc9480cab5e0601efb2815e76c758 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 9 Nov 2014 02:41:47 +0100 Subject: Revert https://github.com/pyload/pyload/commit/7a09515ed34a5f5247c10d666ad8b60a5bd4f867 --- module/plugins/hoster/OneFichierCom.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index b64b1ce7f..190a9175e 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.71" + __version__ = "0.72" __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' @@ -25,9 +25,8 @@ class OneFichierCom(SimpleHoster): NAME_PATTERN = r'>FileName :\s*(?P.+?)<' SIZE_PATTERN = r'>Size :\s*(?P[\d.,]+) (?P[\w^_]+)' - OFFLINE_PATTERN = r'File not found !\s*<' - URL_REPLACEMENTS = [(r'(.+/[^?]+)$', "\1\?"), (r'$', "&lg=en")] #@TODO: Remove in 0.4.10 + OFFLINE_PATTERN = r'File not found !\s*<' COOKIES = [(".1fichier.com", "LG", "en")] -- cgit v1.2.3 From 344f22f9ba8b3aa4e7d8049084db473b76cfb4e3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 9 Nov 2014 21:48:16 +0100 Subject: [Plugin] Update and bugfix --- module/plugins/hoster/OneFichierCom.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 190a9175e..820a4609f 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -41,11 +41,9 @@ class OneFichierCom(SimpleHoster): def handle(self, reconnect): m = re.search(self.WAIT_PATTERN, self.html) if m: - wait_time = int(m.group(1)) + wait_time = int(m.group(1)) * 60 - self.logDebug(_("Wait %d minutes") % wait_time) - - self.wait(wait_time * 60, reconnect) + self.wait(wait_time, reconnect) self.retry(reason="You have to wait been each free download") id = self.info['ID1'] or self.info['ID2'] -- cgit v1.2.3 From 7d8d0991e4d9848325692f8bbb81df00afe4e065 Mon Sep 17 00:00:00 2001 From: Thierry Merle Date: Sat, 15 Nov 2014 07:14:06 +0100 Subject: [SimpleHoster][OneFichierCom] Fix issue #836 ('status': 3) --- module/plugins/hoster/OneFichierCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 820a4609f..7847a11e9 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.72" + __version__ = "0.73" __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' @@ -28,7 +28,7 @@ class OneFichierCom(SimpleHoster): OFFLINE_PATTERN = r'File not found !\s*<' - COOKIES = [(".1fichier.com", "LG", "en")] + COOKIES = [("1fichier.com", "LG", "en")] WAIT_PATTERN = r'>You must wait (\d+)' -- cgit v1.2.3 From 86d3b6249073947132ed3a9eeb1b1e987d19569a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 1 Dec 2014 18:17:13 +0100 Subject: Update some plugins --- module/plugins/hoster/OneFichierCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 7847a11e9..977d45b6f 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.73" + __version__ = "0.74" __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' @@ -46,7 +46,7 @@ class OneFichierCom(SimpleHoster): self.wait(wait_time, reconnect) self.retry(reason="You have to wait been each free download") - id = self.info['ID1'] or self.info['ID2'] + id = self.info['pattern']['ID1'] or self.info['pattern']['ID2'] url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id) if not url: -- cgit v1.2.3 From 67587fbe0335cacfde28a86ba729b9d567ce1da7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 7 Dec 2014 00:27:18 +0100 Subject: Plugin code cosmetics (3) --- module/plugins/hoster/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 977d45b6f..346317271 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -34,7 +34,7 @@ class OneFichierCom(SimpleHoster): def setup(self): - self.multiDL = self.premium + self.multiDL = self.premium self.resumeDownload = True -- cgit v1.2.3 From c9b4f3b9a78904d34d7e58593eacdc26b93c2562 Mon Sep 17 00:00:00 2001 From: philou75 Date: Fri, 12 Dec 2014 22:49:23 +0100 Subject: Make the waiting time work again on OneFichier.com --- module/plugins/hoster/OneFichierCom.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'module/plugins/hoster/OneFichierCom.py') diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 977d45b6f..b5e034c0b 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" - __version__ = "0.74" + __version__ = "0.75" __pattern__ = r'https?://(?:www\.)?(?:(?P\w+)\.)?(?P1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P\w+))?' @@ -30,7 +30,7 @@ class OneFichierCom(SimpleHoster): COOKIES = [("1fichier.com", "LG", "en")] - WAIT_PATTERN = r'>You must wait (\d+)' + WAIT_PATTERN = r'>You must wait (\d+) minutes' def setup(self): @@ -39,13 +39,6 @@ class OneFichierCom(SimpleHoster): def handle(self, reconnect): - m = re.search(self.WAIT_PATTERN, self.html) - if m: - wait_time = int(m.group(1)) * 60 - - self.wait(wait_time, reconnect) - self.retry(reason="You have to wait been each free download") - id = self.info['pattern']['ID1'] or self.info['pattern']['ID2'] url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id) -- cgit v1.2.3