masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix vdsl2 usage, also add "used" formatter (#659)

Browse Source 
* fix vdsl2 usage, also add "used" formatter

* PEP fix
This commit is contained in:
chestm007 2018-08-01 10:17:28 +10:00 committed by Facetoe
parent a252beb1db
commit 35537e95eb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3pystatus/iinet.py
View File

@ -15,6 +15,7 @@ class IINet(IntervalModule, ColorRangeModule):
* `{percentage_used}` — percentage of your quota that is used * `{percentage_used}` — percentage of your quota that is used
* `{percentage_available}` — percentage of your quota that is available * `{percentage_available}` — percentage of your quota that is available
* `{used}` - GB of your quota used
""" """
settings = ( settings = (
@ -75,6 +76,7 @@ class IINet(IntervalModule, ColorRangeModule):
usage['percent_used'] = '{0:.2f}%'.format(percent_used) usage['percent_used'] = '{0:.2f}%'.format(percent_used)
usage['percent_available'] = '{0:.2f}%'.format(percent_avaliable) usage['percent_available'] = '{0:.2f}%'.format(percent_avaliable)
usage['used'] = '{0:.2f}'.format(used / 1000 ** 3)
self.data = usage self.data = usage
self.output = { self.output = {
@ -88,7 +90,7 @@ class IINet(IntervalModule, ColorRangeModule):
'_SERVICE=%(service_token)s' % self.__dict__).json() '_SERVICE=%(service_token)s' % self.__dict__).json()
if self.valid_response(response): if self.valid_response(response):
for traffic_type in response['response']['usage']['traffic_types']: for traffic_type in response['response']['usage']['traffic_types']:
if traffic_type['name'] == 'anytime': if traffic_type['name'] in ('anytime', 'usage'):
return traffic_type return traffic_type
else: else:
raise Exception("Failed to retrieve usage information for: %s" % self.username) raise Exception("Failed to retrieve usage information for: %s" % self.username)