diff options
| author |  Arno-Nymous <Arno-Nymous@users.noreply.github.com>
| 2015-12-22 02:10:05 +0100 |
|---|---|---|
| committer | Arno-Nymous <Arno-Nymous@users.noreply.github.com>
| 2015-12-22 02:10:05 +0100 |
| commit | 988d734890dda4171f1aabe258cfec45062c824f (patch) | |
| tree | 6157337f13a89aac066073ade90867aaa279c057 /module/plugins/accounts | |
| parent | Initial release of WarezWorld hook (diff) | |
| parent | [UgouploadNet] update (diff) | |
| download | pyload-988d734890dda4171f1aabe258cfec45062c824f.tar.xz | |
Merge remote-tracking branch 'pyload/stable' into stable
Diffstat (limited to 'module/plugins/accounts')
| -rw-r--r-- | module/plugins/accounts/FileParadoxIn.py | 17 | ||||
| -rw-r--r-- | module/plugins/accounts/RapiduNet.py | 6 |
2 files changed, 3 insertions, 20 deletions
diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py deleted file mode 100644 index 1a3949583..000000000 --- a/module/plugins/accounts/FileParadoxIn.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- - -from module.plugins.internal.XFSAccount import XFSAccount - - -class FileParadoxIn(XFSAccount): - __name__ = "FileParadoxIn" - __type__ = "account" - __version__ = "0.05" - __status__ = "testing" - - __description__ = """FileParadox.in account plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - - - PLUGIN_DOMAIN = "fileparadox.in" diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index cde39a361..5a852b906 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -10,7 +10,7 @@ from module.plugins.internal.utils import json class RapiduNet(Account): __name__ = "RapiduNet" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __status__ = "testing" __description__ = """Rapidu.net account plugin""" @@ -23,7 +23,7 @@ class RapiduNet(Account): VALID_UNTIL_PATTERN = r'>Account: <b>\w+ \((\d+)' - TRAFFIC_LEFT_PATTERN = r'class="tipsyS"><b>(.+?)<' + TRAFFIC_LEFT_PATTERN = r'class="tipsyS"><b>([\d.,]+)\s*([\w^_]*)<' def grab_info(self, user, password, data): @@ -42,7 +42,7 @@ class RapiduNet(Account): m = re.search(self.TRAFFIC_LEFT_PATTERN, html) if m is not None: - trafficleft = self.parse_traffic(m.group(1)) + trafficleft = self.parse_traffic(m.group(1), m.group(2)) return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} |