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/DebridItaliaCom.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index a8b4248b4..5880b2738 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -1,18 +1,4 @@ # -*- coding: utf-8 -*- -############################################################################ -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU Affero General Public License for more details. # -# # -# You should have received a copy of the GNU Affero General Public License # -# along with this program. If not, see . # -############################################################################ import re @@ -21,13 +7,16 @@ from module.plugins.Hoster import Hoster class DebridItaliaCom(Hoster): __name__ = "DebridItaliaCom" - __version__ = "0.05" __type__ = "hoster" + __version__ = "0.05" + __pattern__ = r'https?://(?:[^/]*\.)?debriditalia\.com' + __description__ = """Debriditalia.com hoster plugin""" __author_name__ = "stickell" __author_mail__ = "l.stickell@yahoo.it" + def setup(self): self.chunkLimit = -1 self.resumeDownload = True -- 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/DebridItaliaCom.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 5880b2738..04dd910f6 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -13,8 +13,7 @@ class DebridItaliaCom(Hoster): __pattern__ = r'https?://(?:[^/]*\.)?debriditalia\.com' __description__ = """Debriditalia.com hoster plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] def setup(self): -- 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/DebridItaliaCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 04dd910f6..4e961fa9f 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -13,6 +13,7 @@ class DebridItaliaCom(Hoster): __pattern__ = r'https?://(?:[^/]*\.)?debriditalia\.com' __description__ = """Debriditalia.com hoster plugin""" + __license__ = "GPLv3" __authors__ = [("stickell", "l.stickell@yahoo.it")] -- cgit v1.2.3 From 0eb6e7ec4a1144dcca824d8add049787d3da1762 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 22 Oct 2014 19:44:59 +0200 Subject: Two space before function declaration --- module/plugins/hoster/DebridItaliaCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 4e961fa9f..b1a2a4c77 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -21,6 +21,7 @@ class DebridItaliaCom(Hoster): self.chunkLimit = -1 self.resumeDownload = True + def process(self, pyfile): if re.match(self.__pattern__, pyfile.url): new_url = pyfile.url -- cgit v1.2.3 From e3f5280529921100f48bb8a79853bf480c7611e4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Oct 2014 02:53:05 +0200 Subject: Replace single quotes with doubles in self.error and self.fail msg --- module/plugins/hoster/DebridItaliaCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index b1a2a4c77..84f9fbb72 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -35,7 +35,7 @@ class DebridItaliaCom(Hoster): self.logDebug("XML data: %s" % page) if 'File not available' in page: - self.fail('File not available') + self.fail("File not available") else: new_url = re.search(r'(?P[^<]+)', page).group('direct') -- 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/DebridItaliaCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 84f9fbb72..c82d13363 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -27,7 +27,7 @@ class DebridItaliaCom(Hoster): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "DebridItalia") - self.fail("No DebridItalia account provided") + self.fail(_("No DebridItalia account provided")) else: self.logDebug("Old URL: %s" % pyfile.url) url = "http://debriditalia.com/linkgen2.php?xjxfun=convertiLink&xjxargs[]=S" % pyfile.url @@ -35,7 +35,7 @@ class DebridItaliaCom(Hoster): self.logDebug("XML data: %s" % page) if 'File not available' in page: - self.fail("File not available") + self.fail(_("File not available")) else: new_url = re.search(r'(?P[^<]+)', page).group('direct') -- 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/DebridItaliaCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index c82d13363..dbac000c8 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -6,15 +6,15 @@ from module.plugins.Hoster import Hoster class DebridItaliaCom(Hoster): - __name__ = "DebridItaliaCom" - __type__ = "hoster" + __name__ = "DebridItaliaCom" + __type__ = "hoster" __version__ = "0.05" __pattern__ = r'https?://(?:[^/]*\.)?debriditalia\.com' __description__ = """Debriditalia.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] def setup(self): -- cgit v1.2.3 From 2c38c50e936b203183013b7be9907375801b5d3f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 6 Dec 2014 01:38:05 +0100 Subject: [DebridItaliaCom] Updated --- module/plugins/hoster/DebridItaliaCom.py | 37 +++++++++++++++++--------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index dbac000c8..90f1233ff 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -3,48 +3,51 @@ import re from module.plugins.Hoster import Hoster +from module.plugins.internal.SimpleHoster import replace_patterns class DebridItaliaCom(Hoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.05" + __version__ = "0.06" - __pattern__ = r'https?://(?:[^/]*\.)?debriditalia\.com' + __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' __description__ = """Debriditalia.com hoster plugin""" __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __authors__ = [("stickell", "l.stickell@yahoo.it"), + ("Walter Purcaro", "vuolter@gmail.com")] + + + URL_REPLACEMENTS = [(r'(/dl/\d+)$', '\1/')] def setup(self): - self.chunkLimit = -1 + self.chunkLimit = -1 self.resumeDownload = True def process(self, pyfile): + pyfile.url = replace_patterns(pyfile.url, cls.URL_REPLACEMENTS) + if re.match(self.__pattern__, pyfile.url): - new_url = pyfile.url + link = pyfile.url + elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "DebridItalia") self.fail(_("No DebridItalia account provided")) + else: - self.logDebug("Old URL: %s" % pyfile.url) - url = "http://debriditalia.com/linkgen2.php?xjxfun=convertiLink&xjxargs[]=S" % pyfile.url - page = self.load(url) - self.logDebug("XML data: %s" % page) + html = self.load("http://www.debriditalia.com/api.php?generate=&link=%s" % pyfile.url) - if 'File not available' in page: - self.fail(_("File not available")) - else: - new_url = re.search(r'(?P[^<]+)', page).group('direct') + if "ERROR" in html: + self.fail(re.search(r'ERROR:(.*)', html).split()) - if new_url != pyfile.url: - self.logDebug("New URL: %s" % new_url) + link = html.split() - self.download(new_url, disposition=True) + self.download(link, disposition=True) - check = self.checkDownload({"empty": re.compile(r"^$")}) + check = self.checkDownload({'empty': re.compile(r"^$")}) if check == "empty": self.retry(5, 2 * 60, "Empty file downloaded") -- cgit v1.2.3 From 209eafa08ae9bd45b378a0edf7e32b7bc4e73482 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 6 Dec 2014 02:11:39 +0100 Subject: [DebridItaliaCom] Typo fixup --- module/plugins/hoster/DebridItaliaCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 90f1233ff..cb5d4c06a 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import replace_patterns class DebridItaliaCom(Hoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.06" + __version__ = "0.07" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -41,13 +41,13 @@ class DebridItaliaCom(Hoster): html = self.load("http://www.debriditalia.com/api.php?generate=&link=%s" % pyfile.url) if "ERROR" in html: - self.fail(re.search(r'ERROR:(.*)', html).split()) + self.fail(re.search(r'ERROR:(.*)', html).strip()) - link = html.split() + link = html.strip() self.download(link, disposition=True) - check = self.checkDownload({'empty': re.compile(r"^$")}) + check = self.checkDownload({'empty': re.compile(r'^$')}) if check == "empty": self.retry(5, 2 * 60, "Empty file downloaded") -- cgit v1.2.3 From ca0ce20d5a805080f69dad4c24997ace1958bbcb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 6 Dec 2014 17:18:40 +0100 Subject: Plugin code cosmetics --- module/plugins/hoster/DebridItaliaCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index cb5d4c06a..17342b8cd 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -38,7 +38,7 @@ class DebridItaliaCom(Hoster): self.fail(_("No DebridItalia account provided")) else: - html = self.load("http://www.debriditalia.com/api.php?generate=&link=%s" % pyfile.url) + html = self.load("http://www.debriditalia.com/api.php", get={'generate': "", 'link': pyfile.url}) if "ERROR" in html: self.fail(re.search(r'ERROR:(.*)', html).strip()) -- cgit v1.2.3 From 57300575fa97107d172e0c9909b244c8c8ae6c12 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Dec 2014 20:02:20 +0100 Subject: Extend SimpleHoster in multi-hoster plugins --- module/plugins/hoster/DebridItaliaCom.py | 37 +++++++++++--------------------- 1 file changed, 13 insertions(+), 24 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 17342b8cd..da52c080b 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -2,14 +2,13 @@ import re -from module.plugins.Hoster import Hoster -from module.plugins.internal.SimpleHoster import replace_patterns +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -class DebridItaliaCom(Hoster): +class DebridItaliaCom(SimpleHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.07" + __version__ = "0.09" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -19,35 +18,25 @@ class DebridItaliaCom(Hoster): ("Walter Purcaro", "vuolter@gmail.com")] - URL_REPLACEMENTS = [(r'(/dl/\d+)$', '\1/')] - - def setup(self): self.chunkLimit = -1 self.resumeDownload = True - def process(self, pyfile): - pyfile.url = replace_patterns(pyfile.url, cls.URL_REPLACEMENTS) - - if re.match(self.__pattern__, pyfile.url): - link = pyfile.url - - elif not self.account: - self.logError(_("Please enter your %s account or deactivate this plugin") % "DebridItalia") - self.fail(_("No DebridItalia account provided")) + def handleMulti(self): + html = self.load("http://www.debriditalia.com/api.php", + get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()}) - else: - html = self.load("http://www.debriditalia.com/api.php", get={'generate': "", 'link': pyfile.url}) + if "ERROR" in html: + self.fail(re.search(r'ERROR:(.*)', html).strip()) - if "ERROR" in html: - self.fail(re.search(r'ERROR:(.*)', html).strip()) + self.link = html.strip() - link = html.strip() - - self.download(link, disposition=True) + def checkFile(self): check = self.checkDownload({'empty': re.compile(r'^$')}) - if check == "empty": self.retry(5, 2 * 60, "Empty file downloaded") + + +getInfo = create_getInfo(DebridItaliaCom) -- cgit v1.2.3 From 46f748a94ea5ab62ab0839ff0ce01e12e3eac688 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Dec 2014 21:47:39 +0100 Subject: Extend SimpleHoster in multi-hoster plugins (2) --- module/plugins/hoster/DebridItaliaCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index da52c080b..28c49091b 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DebridItaliaCom(SimpleHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.09" + __version__ = "0.08" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' -- cgit v1.2.3 From 0860e09f5ff16ee3f097f6f9d444f277a38abd72 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Dec 2014 23:03:46 +0100 Subject: Extend SimpleHoster in multi-hoster plugins (3) --- module/plugins/hoster/DebridItaliaCom.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 28c49091b..f9f4ce06d 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -18,6 +18,9 @@ class DebridItaliaCom(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] + MULTI_HOSTER = True + + def setup(self): self.chunkLimit = -1 self.resumeDownload = True -- cgit v1.2.3 From c8f03124db975ddb9917036ba1f907dea2dea353 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 18 Dec 2014 00:02:12 +0100 Subject: [DebridItaliaCom] Fix hoster plugin typo --- module/plugins/hoster/DebridItaliaCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index f9f4ce06d..6a86ba4e4 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DebridItaliaCom(SimpleHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.08" + __version__ = "0.09" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -30,8 +30,8 @@ class DebridItaliaCom(SimpleHoster): html = self.load("http://www.debriditalia.com/api.php", get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()}) - if "ERROR" in html: - self.fail(re.search(r'ERROR:(.*)', html).strip()) + if "ERROR:" in html: + self.fail(re.search(r'ERROR:(.*)', html).group(1).strip()) self.link = html.strip() -- cgit v1.2.3 From 4e9c8f7ab1269966a9eac9e1b6363f5458f9f970 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 18 Dec 2014 16:07:21 +0100 Subject: Update checkFile routine in some hoster plugins --- module/plugins/hoster/DebridItaliaCom.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 6a86ba4e4..ae7051572 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DebridItaliaCom(SimpleHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.09" + __version__ = "0.10" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -36,10 +36,4 @@ class DebridItaliaCom(SimpleHoster): self.link = html.strip() - def checkFile(self): - check = self.checkDownload({'empty': re.compile(r'^$')}) - if check == "empty": - self.retry(5, 2 * 60, "Empty file downloaded") - - getInfo = create_getInfo(DebridItaliaCom) -- cgit v1.2.3 From bfeff7155506d3c5e819be662a2890f21d1c3ee8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 22 Dec 2014 01:41:47 +0100 Subject: [DebridItaliaCom] Fix chunkLimit --- module/plugins/hoster/DebridItaliaCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index ae7051572..4dbbe32aa 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DebridItaliaCom(SimpleHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.10" + __version__ = "0.11" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -22,7 +22,7 @@ class DebridItaliaCom(SimpleHoster): def setup(self): - self.chunkLimit = -1 + self.chunkLimit = 1 self.resumeDownload = True -- cgit v1.2.3 From 87203e996fb42c172b15e29f0e394d5b328d9ac2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 23 Dec 2014 13:20:53 +0100 Subject: New plugin: MultiHoster --- module/plugins/hoster/DebridItaliaCom.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 4dbbe32aa..21b6917d9 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -2,13 +2,13 @@ import re -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo -class DebridItaliaCom(SimpleHoster): +class DebridItaliaCom(MultiHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.11" + __version__ = "0.12" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -18,7 +18,7 @@ class DebridItaliaCom(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - MULTI_HOSTER = True + URL_REPLACEMENTS = [("https://", "http://")] def setup(self): @@ -27,13 +27,22 @@ class DebridItaliaCom(SimpleHoster): def handleMulti(self): - html = self.load("http://www.debriditalia.com/api.php", - get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()}) - - if "ERROR:" in html: - self.fail(re.search(r'ERROR:(.*)', html).group(1).strip()) - - self.link = html.strip() + self.html = self.load("http://www.debriditalia.com/api.php", + get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()}) + + if "ERROR:" not in self.html: + self.link = self.html.strip() + else: + errmsg = re.search(r'ERROR:(.*)', self.html).group(1).strip() + + self.html = self.load("http://debriditalia.com/linkgen2.php", + post={'xjxfun' : "convertiLink", + 'xjxargs[]': "S" % self.pyfile.url}) + + self.link = re.search(r' Date: Tue, 23 Dec 2014 13:26:32 +0100 Subject: [SimpleHoster] Improve multi-hoster feature --- module/plugins/hoster/DebridItaliaCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 21b6917d9..c3391e090 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -34,13 +34,13 @@ class DebridItaliaCom(MultiHoster): self.link = self.html.strip() else: errmsg = re.search(r'ERROR:(.*)', self.html).group(1).strip() - + self.html = self.load("http://debriditalia.com/linkgen2.php", post={'xjxfun' : "convertiLink", 'xjxargs[]': "S" % self.pyfile.url}) self.link = re.search(r' Date: Tue, 23 Dec 2014 14:04:06 +0100 Subject: [DebridItaliaCom] Improve password support --- module/plugins/hoster/DebridItaliaCom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index c3391e090..10801a879 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class DebridItaliaCom(MultiHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.12" + __version__ = "0.13" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -37,7 +37,8 @@ class DebridItaliaCom(MultiHoster): self.html = self.load("http://debriditalia.com/linkgen2.php", post={'xjxfun' : "convertiLink", - 'xjxargs[]': "S" % self.pyfile.url}) + 'xjxargs[]': "S" % self.pyfile.url, + 'xjxargs[]': "S%s" % self.getPassword()}) self.link = re.search(r' Date: Tue, 23 Dec 2014 19:29:15 +0100 Subject: [MultiHoster] Update --- module/plugins/hoster/DebridItaliaCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 10801a879..d20afb620 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class DebridItaliaCom(MultiHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.13" + __version__ = "0.14" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -26,7 +26,7 @@ class DebridItaliaCom(MultiHoster): self.resumeDownload = True - def handleMulti(self): + def handlePremium(self): self.html = self.load("http://www.debriditalia.com/api.php", get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()}) -- cgit v1.2.3 From 9371e7c7f83d821cc1f4ce4580cfec05164f3595 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 26 Dec 2014 04:24:21 +0100 Subject: [DebridItaliaCom] Fixup --- module/plugins/hoster/DebridItaliaCom.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index d20afb620..34a306cce 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class DebridItaliaCom(MultiHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.14" + __version__ = "0.15" __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' @@ -33,17 +33,16 @@ class DebridItaliaCom(MultiHoster): if "ERROR:" not in self.html: self.link = self.html.strip() else: - errmsg = re.search(r'ERROR:(.*)', self.html).group(1).strip() + self.info['error'] = re.search(r'ERROR:(.*)', self.html).group(1).strip() self.html = self.load("http://debriditalia.com/linkgen2.php", post={'xjxfun' : "convertiLink", 'xjxargs[]': "S" % self.pyfile.url, 'xjxargs[]': "S%s" % self.getPassword()}) - - self.link = re.search(r' Date: Tue, 30 Dec 2014 19:31:19 +0100 Subject: Update some MultiHoster __pattern__ --- module/plugins/hoster/DebridItaliaCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DebridItaliaCom.py') diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 34a306cce..842e3cd63 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -8,9 +8,9 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class DebridItaliaCom(MultiHoster): __name__ = "DebridItaliaCom" __type__ = "hoster" - __version__ = "0.15" + __version__ = "0.16" - __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' + __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' __description__ = """Debriditalia.com hoster plugin""" __license__ = "GPLv3" -- cgit v1.2.3