From c9ef02f1d748738ffaa197aa8a6f94b69a4237b3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Oct 2014 13:49:08 +0200 Subject: New account XFileSharingPro --- module/plugins/accounts/XFileSharingPro.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 module/plugins/accounts/XFileSharingPro.py (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py new file mode 100644 index 000000000..cd09c076d --- /dev/null +++ b/module/plugins/accounts/XFileSharingPro.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- + +import re + +from module.plugins.internal.XFSPAccount import XFSPAccount + + +class XFileSharingPro(XFSPAccount): + __name__ = "XFileSharingPro" + __type__ = "crypter" + __version__ = "0.01" + + __description__ = """XFileSharingPro dummy account plugin for hook""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + + + def init(self): + pattern = self.core.pluginManager.hosterPlugins[self.__name__]['pattern'] + self.HOSTER_NAME = re.match(pattern, self.pyfile.url).group(1).lower() -- cgit v1.2.3 From 0c35c0f7fe126b87eccdf4f69933b84927956658 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Oct 2014 15:19:59 +0200 Subject: [XFileSharingPro] Fix account __type__ --- module/plugins/accounts/XFileSharingPro.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index cd09c076d..d5a62c3a4 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -7,10 +7,10 @@ from module.plugins.internal.XFSPAccount import XFSPAccount class XFileSharingPro(XFSPAccount): __name__ = "XFileSharingPro" - __type__ = "crypter" - __version__ = "0.01" + __type__ = "account" + __version__ = "0.02" - __description__ = """XFileSharingPro dummy account plugin for hook""" + __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] -- cgit v1.2.3 From 8edb5481e04da44a227e18c76fc4073297721f4f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Oct 2014 16:29:41 +0200 Subject: [XFileSharingPro] Fixes --- module/plugins/accounts/XFileSharingPro.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index d5a62c3a4..5be377c40 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -10,11 +10,21 @@ class XFileSharingPro(XFSPAccount): __type__ = "account" __version__ = "0.02" - __description__ = """XFileSharingPro multi-purpose account plugin""" + __description__ = """XFileSharingPro dummy account plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - def init(self): - pattern = self.core.pluginManager.hosterPlugins[self.__name__]['pattern'] - self.HOSTER_NAME = re.match(pattern, self.pyfile.url).group(1).lower() + HOSTER_NAME = None + + + def loadAccountInfo(self, user, req): + if self.HOSTER_NAME: + return super(XFileSharingPro, self).loadAccountInfo(user, req) + else: + return {'validuntil': None, 'trafficleft': None, 'premium': None} + + + def login(self, user, data, req): + if self.HOSTER_NAME: + return super(XFileSharingPro, self).login(user, data, req) -- cgit v1.2.3 From 477120dfa8090f808ce17267896456c082714203 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Oct 2014 19:09:49 +0200 Subject: Fixed logging issue with coords values --- module/plugins/accounts/XFileSharingPro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 5be377c40..fba774b21 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -10,7 +10,7 @@ class XFileSharingPro(XFSPAccount): __type__ = "account" __version__ = "0.02" - __description__ = """XFileSharingPro dummy account plugin""" + __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] -- 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/accounts/XFileSharingPro.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index fba774b21..17f46e102 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -6,13 +6,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount class XFileSharingPro(XFSPAccount): - __name__ = "XFileSharingPro" - __type__ = "account" + __name__ = "XFileSharingPro" + __type__ = "account" __version__ = "0.02" __description__ = """XFileSharingPro multi-purpose account plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_NAME = None -- cgit v1.2.3 From 227a0eb5157875e75a385118ec3485b044ccdb8a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 21:55:21 +0100 Subject: Improve loadAccountInfo stuff --- module/plugins/accounts/XFileSharingPro.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 17f46e102..16d1ccfda 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -8,7 +8,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount class XFileSharingPro(XFSPAccount): __name__ = "XFileSharingPro" __type__ = "account" - __version__ = "0.02" + __version__ = "0.03" __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" @@ -19,10 +19,7 @@ class XFileSharingPro(XFSPAccount): def loadAccountInfo(self, user, req): - if self.HOSTER_NAME: - return super(XFileSharingPro, self).loadAccountInfo(user, req) - else: - return {'validuntil': None, 'trafficleft': None, 'premium': None} + return super(XFileSharingPro if self.HOSTER_NAME else XFSPAccount, self).loadAccountInfo(user, req) def login(self, user, data, req): -- cgit v1.2.3 From bdb8d48e0030474a616ec2e7e6d5f19132bb18e7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 30 Oct 2014 17:12:50 +0100 Subject: [XFileSharingPro] Fix account init --- module/plugins/accounts/XFileSharingPro.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 16d1ccfda..c6baad4f8 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -1,14 +1,12 @@ # -*- coding: utf-8 -*- -import re - from module.plugins.internal.XFSPAccount import XFSPAccount class XFileSharingPro(XFSPAccount): __name__ = "XFileSharingPro" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" @@ -18,6 +16,11 @@ class XFileSharingPro(XFSPAccount): HOSTER_NAME = None + def init(self): + if self.HOSTER_NAME: + return super(XFileSharingPro, self).init() + + def loadAccountInfo(self, user, req): return super(XFileSharingPro if self.HOSTER_NAME else XFSPAccount, self).loadAccountInfo(user, req) -- 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/accounts/XFileSharingPro.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index c6baad4f8..fb77ab23f 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -1,30 +1,30 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPAccount import XFSPAccount +from module.plugins.internal.XFSAccount import XFSAccount -class XFileSharingPro(XFSPAccount): +class XFileSharingPro(XFSAccount): __name__ = "XFileSharingPro" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - HOSTER_NAME = None + HOSTER_DOMAIN = None def init(self): - if self.HOSTER_NAME: + if self.HOSTER_DOMAIN: return super(XFileSharingPro, self).init() def loadAccountInfo(self, user, req): - return super(XFileSharingPro if self.HOSTER_NAME else XFSPAccount, self).loadAccountInfo(user, req) + return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).loadAccountInfo(user, req) def login(self, user, data, req): - if self.HOSTER_NAME: + if self.HOSTER_DOMAIN: return super(XFileSharingPro, self).login(user, data, req) -- cgit v1.2.3 From cc833c564e01971b0a915c2f5343ad683c65b825 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 23 Dec 2014 18:49:39 +0100 Subject: [LinestorageCom] Fix account plugin --- module/plugins/accounts/XFileSharingPro.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index fb77ab23f..8dc7f3a30 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class XFileSharingPro(XFSAccount): __name__ = "XFileSharingPro" __type__ = "account" - __version__ = "0.05" + __version__ = "0.06" __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" @@ -27,4 +27,8 @@ class XFileSharingPro(XFSAccount): def login(self, user, data, req): if self.HOSTER_DOMAIN: - return super(XFileSharingPro, self).login(user, data, req) + try: + return super(XFileSharingPro, self).login(user, data, req) + except Exception: + self.HOSTER_URL = self.HOSTER_URL.replace("www.", "") + return super(XFileSharingPro, self).login(user, data, req) -- cgit v1.2.3