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

add total rcv/snt Mbytes to network module

Browse Source
This commit is contained in:
microarm15 2015-06-15 18:57:41 +02:00
parent c5fe29d258
commit 475c788c0c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
i3pystatus/network.py
View File

@ -198,6 +198,14 @@ class NetworkTraffic():
def get_packets_received(self): def get_packets_received(self):
return self.pnic.packets_recv - self.pnic_before.packets_recv return self.pnic.packets_recv - self.pnic_before.packets_recv
def get_rx_tot_Mbytes(self, interface):
with open("/sys/class/net/{}/statistics/rx_bytes".format(interface)) as f:
return int(f.readline().split('\n')[0])/(1024*1024)
def get_tx_tot_Mbytes(self, interface):
with open("/sys/class/net/{}/statistics/tx_bytes".format(interface)) as f:
return int(f.readline().split('\n')[0])/(1024*1024)
def get_usage(self, interface): def get_usage(self, interface):
self.update_counters(interface) self.update_counters(interface)
usage = dict(bytes_sent=0, bytes_recv=0, packets_sent=0, packets_recv=0) usage = dict(bytes_sent=0, bytes_recv=0, packets_sent=0, packets_recv=0)
@ -209,6 +217,8 @@ class NetworkTraffic():
usage["bytes_recv"] = self.get_bytes_received() usage["bytes_recv"] = self.get_bytes_received()
usage["packets_sent"] = self.get_packets_sent() usage["packets_sent"] = self.get_packets_sent()
usage["packets_recv"] = self.get_packets_received() usage["packets_recv"] = self.get_packets_received()
usage["rx_tot_Mbytes"] = self.get_rx_tot_Mbytes(interface)
usage["tx_tot_Mbytes"] = self.get_tx_tot_Mbytes(interface)
round_dict(usage, self.round_size) round_dict(usage, self.round_size)
return usage return usage
@ -249,6 +259,8 @@ class Network(IntervalModule, ColorRangeModule):
* `{bytes_recv}` — bytes received per second (divided by divisor) * `{bytes_recv}` — bytes received per second (divided by divisor)
* `{packets_sent}` — bytes sent per second (divided by divisor) * `{packets_sent}` — bytes sent per second (divided by divisor)
* `{packets_recv}` — bytes received per second (divided by divisor) * `{packets_recv}` — bytes received per second (divided by divisor)
^ `{rx_tot_Mbytes}` — total Mbytes received
^ `{tx_tot_Mbytes}` — total Mbytes sent
""" """
settings = ( settings = (
("format_up", "format string"), ("format_up", "format string"),
@ -313,7 +325,8 @@ class Network(IntervalModule, ColorRangeModule):
# Don't require importing psutil unless using the functionality it offers. # Don't require importing psutil unless using the functionality it offers.
if any(s in self.format_up or s in self.format_down for s in if any(s in self.format_up or s in self.format_down for s in
['bytes_sent', 'bytes_recv', 'packets_sent', 'packets_recv', 'network_graph', 'kbs']): ['bytes_sent', 'bytes_recv', 'packets_sent', 'packets_recv', 'network_graph',
'rx_tot_Mbytes', 'tx_tot_Mbytes', 'kbs']):
self.network_traffic = NetworkTraffic(self.unknown_up, self.divisor, self.round_size) self.network_traffic = NetworkTraffic(self.unknown_up, self.divisor, self.round_size)
else: else:
self.network_traffic = None self.network_traffic = None
@ -343,6 +356,7 @@ class Network(IntervalModule, ColorRangeModule):
def run(self): def run(self):
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="",
rx_tot_Mbytes="", tx_tot_Mbytes="",
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="")
if self.network_traffic: if self.network_traffic: