From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- 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 8dc7f3a30..e47e8fafc 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.06" + __version__ = "0.07" __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" @@ -21,8 +21,8 @@ class XFileSharingPro(XFSAccount): return super(XFileSharingPro, self).init() - def loadAccountInfo(self, user, req): - return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).loadAccountInfo(user, req) + def load_account_info(self, user, req): + return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).load_account_info(user, req) def login(self, user, data, req): -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/accounts/XFileSharingPro.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index e47e8fafc..868070897 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -7,6 +7,7 @@ class XFileSharingPro(XFSAccount): __name__ = "XFileSharingPro" __type__ = "account" __version__ = "0.07" + __status__ = "stable" __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- 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 868070897..514dc2bbe 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -7,7 +7,7 @@ class XFileSharingPro(XFSAccount): __name__ = "XFileSharingPro" __type__ = "account" __version__ = "0.07" - __status__ = "stable" + __status__ = "testing" __description__ = """XFileSharingPro multi-purpose account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 8f17f875f6e28f73ddb10da59c6464bd04922222 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 04:59:27 +0200 Subject: Account rewritten --- module/plugins/accounts/XFileSharingPro.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 514dc2bbe..62270a2b0 100644 --- a/module/plugins/accounts/XFileSharingPro.py +++ b/module/plugins/accounts/XFileSharingPro.py @@ -22,11 +22,7 @@ class XFileSharingPro(XFSAccount): return super(XFileSharingPro, self).init() - def load_account_info(self, user, req): - return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).load_account_info(user, req) - - - def login(self, user, data, req): + def login(self, user, password, data, req): if self.HOSTER_DOMAIN: try: return super(XFileSharingPro, self).login(user, data, req) -- cgit v1.2.3 From d0acce3be51760fc97c6d8cf298ef37ba2f299ec Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Aug 2015 18:37:00 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1591 --- module/plugins/accounts/XFileSharingPro.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'module/plugins/accounts/XFileSharingPro.py') diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py index 62270a2b0..7066445b2 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.07" + __version__ = "0.08" __status__ = "testing" __description__ = """XFileSharingPro multi-purpose account plugin""" @@ -17,15 +17,10 @@ class XFileSharingPro(XFSAccount): HOSTER_DOMAIN = None - def init(self): - if self.HOSTER_DOMAIN: - return super(XFileSharingPro, self).init() - - def login(self, user, password, data, req): - if self.HOSTER_DOMAIN: - 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) + try: + return super(XFileSharingPro, self).login(user, data, req) + + except Fail: + self.HOSTER_URL = self.HOSTER_URL.replace("www.", "") + return super(XFileSharingPro, self).login(user, data, req) -- cgit v1.2.3 From 70293152cc01b14f65481778cbe03e0281301774 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Tue, 4 Aug 2015 01:51:10 +0300 Subject: Update XFileSharingPro.py --- 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 7066445b2..f21247cf4 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.08" + __version__ = "0.09" __status__ = "testing" __description__ = """XFileSharingPro multi-purpose account plugin""" -- cgit v1.2.3