diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-10-26 19:35:43 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-10-26 19:35:43 +0100 |
| commit | e92919794e2c7e49e015fee8dfc906404fa0e541 (patch) | |
| tree | ce6fee5f50b345e1288d371df0aad2b0da431315 | |
| parent | Translation support for error method logging (diff) | |
| download | pyload-e92919794e2c7e49e015fee8dfc906404fa0e541.tar.xz | |
[XFSPAccount] Improve VALID_UNTIL_PATTERN
| -rw-r--r-- | module/plugins/accounts/UptoboxCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/XFSPAccount.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index aed769f7d..0fda7cd5e 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount class UptoboxCom(XFSPAccount): __name__ = "UptoboxCom" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __description__ = """DDLStorage.com account plugin""" __license__ = "GPLv3" @@ -14,5 +14,3 @@ class UptoboxCom(XFSPAccount): HOSTER_NAME = "uptobox.com" - - VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire: ([^<]+)</strong>' diff --git a/module/plugins/internal/XFSPAccount.py b/module/plugins/internal/XFSPAccount.py index e54fda987..69b5cfc22 100644 --- a/module/plugins/internal/XFSPAccount.py +++ b/module/plugins/internal/XFSPAccount.py @@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies class XFSPAccount(Account): __name__ = "XFSPAccount" __type__ = "account" - __version__ = "0.16" + __version__ = "0.17" __description__ = """XFileSharingPro account plugin""" __license__ = "GPLv3" @@ -34,7 +34,7 @@ class XFSPAccount(Account): COOKIES = [(HOSTER_NAME, "lang", "english")] #: or list of tuples [(domain, name, value)] - VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire:.*?<b>(.+?)</b>' + VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire:.*?([^><]+)</(b|strong)>' TRAFFIC_LEFT_PATTERN = r'>Traffic available today:.*?<b>\s*(?P<S>[\d.,]+)\s*(?:(?P<U>[\w^_]+)\s*)?</b>' TRAFFIC_LEFT_UNIT = "MB" #: used only if no group <U> was found |