diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-12-02 00:08:42 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-12-02 00:08:42 +0100 |
commit | 2a8d0af88b07e62eeb316a8dfbb7cd8d7dbfdcac (patch) | |
tree | 4324ec7c224724156ee9897e8689135f85e2e804 /module/plugins/accounts | |
parent | Merge pull request #920 from chris-19/stable (diff) | |
parent | [SimpleHoster] Force _isDirectLink to old style (diff) | |
download | pyload-2a8d0af88b07e62eeb316a8dfbb7cd8d7dbfdcac.tar.xz |
Merge branch 'stable-next' into stable
Diffstat (limited to 'module/plugins/accounts')
-rw-r--r-- | module/plugins/accounts/EasybytezCom.py | 8 | ||||
-rw-r--r-- | module/plugins/accounts/SafesharingEu.py | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 0afd93d3b..93d3e2c19 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -8,7 +8,7 @@ from module.plugins.internal.XFSAccount import XFSAccount class EasybytezCom(XFSAccount): __name__ = "EasybytezCom" __type__ = "account" - __version__ = "0.11" + __version__ = "0.12" __description__ = """EasyBytez.com account plugin""" __license__ = "GPLv3" @@ -17,9 +17,3 @@ class EasybytezCom(XFSAccount): HOSTER_DOMAIN = "easybytez.com" - - - def loadAccountInfo(self, *args, **kwargs): - info = super(EasybytezCom, self).loadAccountInfo(*args, **kwargs) - info['leechtraffic'] = 26214400 - return info diff --git a/module/plugins/accounts/SafesharingEu.py b/module/plugins/accounts/SafesharingEu.py index a2b964cba..2e58d33b3 100644 --- a/module/plugins/accounts/SafesharingEu.py +++ b/module/plugins/accounts/SafesharingEu.py @@ -4,16 +4,13 @@ from module.plugins.internal.XFSAccount import XFSAccount class SafesharingEu(XFSAccount): - __name__ = "SafesharingEu" - __type__ = "account" + __name__ = "SafesharingEu" + __type__ = "account" __version__ = "0.02" __description__ = """Safesharing.eu account plugin""" - __license__ = "GPLv3" - __authors__ = [("guidobelix", "guidobelix@hotmail.it")] + __license__ = "GPLv3" + __authors__ = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "safesharing.eu" - - VALID_UNTIL_PATTERN = r'> Premium.[Aa]ccount expire:(.+?)</div>' - TRAFFIC_LEFT_PATTERN = r'> Traffic available today:\s*?(?P<S>[\d.,]+)\s*?(?:(?P<U>[\w^_]+)\s*)?</div>' |