From 0cc557e1964b23fee7b96baf1c0f293dd981ba00 Mon Sep 17 00:00:00 2001 From: Stefano Date: Fri, 28 Mar 2014 12:12:12 +0100 Subject: Merge pull request #562 from vuolter/s/hoster/ShareFilesCo ShareFilesCo: dead (cherry picked from commit 31e67a69d7349ebcc22e604a1b36d02d54878e24) Conflicts: pyload/plugins/accounts/ShareFilesCo.py --- pyload/plugins/accounts/ShareFilesCo.py | 13 ------------- pyload/plugins/hoster/ShareFilesCo.py | 24 ++++++------------------ 2 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 pyload/plugins/accounts/ShareFilesCo.py diff --git a/pyload/plugins/accounts/ShareFilesCo.py b/pyload/plugins/accounts/ShareFilesCo.py deleted file mode 100644 index cff52d570..000000000 --- a/pyload/plugins/accounts/ShareFilesCo.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from module.plugins.internal.XFSPAccount import XFSPAccount - - -class ShareFilesCo(XFSPAccount): - __name__ = "ShareFilesCo" - __version__ = "0.01" - __type__ = "account" - __description__ = """ShareFilesCo account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") - - MAIN_PAGE = "http://sharefiles.co/" diff --git a/pyload/plugins/hoster/ShareFilesCo.py b/pyload/plugins/hoster/ShareFilesCo.py index 245e20ea6..35f21916c 100644 --- a/pyload/plugins/hoster/ShareFilesCo.py +++ b/pyload/plugins/hoster/ShareFilesCo.py @@ -1,28 +1,16 @@ # -*- coding: utf-8 -*- -import re -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo -class ShareFilesCo(XFileSharingPro): +class ShareFilesCo(DeadHoster): __name__ = "ShareFilesCo" __type__ = "hoster" - __pattern__ = r"http://(www\.)?sharefiles\.co/\w{12}" - __version__ = "0.01" + __pattern__ = r'http://(?:www\.)?sharefiles\.co/\w{12}' + __version__ = "0.02" __description__ = """Sharefiles.co hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") - - HOSTER_NAME = "sharefiles.co" - - def startDownload(self, link): - link = link.strip() - if link.startswith('http://adf.ly'): - link = re.sub('http://adf.ly/\d+/', '', link) - if self.captcha: - self.correctCaptcha() - self.logDebug('DIRECT LINK: %s' % link) - self.download(link) + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" getInfo = create_getInfo(ShareFilesCo) -- cgit v1.2.3