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

Fixed bug that prevented color_up being shown if the user is not using network_traffic.

Browse Source
This commit is contained in:
facetoe 2015-03-08 08:38:08 +08:00
parent 22b5abf899
commit 4209d7046c
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
i3pystatus/network.py
View File

@ -337,7 +337,6 @@ class Network(IntervalModule, ColorRangeModule):
format_values = dict(kbs="", network_graph="", bytes_sent="", bytes_recv="", packets_sent="", packets_recv="", format_values = dict(kbs="", network_graph="", bytes_sent="", bytes_recv="", packets_sent="", packets_recv="",
interface="", v4="", v4mask="", v4cidr="", v6="", v6mask="", v6cidr="", mac="", interface="", v4="", v4mask="", v4cidr="", v6="", v6mask="", v6cidr="", mac="",
essid="", freq="", quality="", quality_bar="") essid="", freq="", quality="", quality_bar="")
color = None
if self.network_traffic: if self.network_traffic:
network_usage = self.network_traffic.get_usage(self.interface) network_usage = self.network_traffic.get_usage(self.interface)
format_values.update(network_usage) format_values.update(network_usage)
@ -351,22 +350,22 @@ class Network(IntervalModule, ColorRangeModule):
format_values['network_graph'] = self.get_network_graph(kbs) format_values['network_graph'] = self.get_network_graph(kbs)
format_values['kbs'] = "{0:.1f}".format(round(kbs, 2)).rjust(6) format_values['kbs'] = "{0:.1f}".format(round(kbs, 2)).rjust(6)
color = self.get_gradient(kbs, self.colors, self.upper_limit) color = self.get_gradient(kbs, self.colors, self.upper_limit)
else:
color = None
if sysfs_interface_up(self.interface, self.unknown_up):
if not color:
color = self.color_up
format_str = self.format_up
else:
color = self.color_down
format_str = self.format_down
network_info = self.network_info.get_info(self.interface) network_info = self.network_info.get_info(self.interface)
format_values.update(network_info) format_values.update(network_info)
format_values['interface'] = self.interface format_values['interface'] = self.interface
if sysfs_interface_up(self.interface, self.unknown_up):
if not self.dynamic_color:
color = self.color_up
self.output = { self.output = {
"full_text": self.format_up.format(**format_values), "full_text": format_str.format(**format_values),
'color': color, 'color': color,
} }
else:
color = self.color_down
self.output = {
"full_text": self.format_down.format(**format_values),
'color': color,
}