From 5b7e0db847c46affc207c327835d1efd3b2727de Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 25 Nov 2023 18:08:34 +0100 Subject: Misc updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- xpybar/config/mynetwork.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'xpybar/config/mynetwork.py') diff --git a/xpybar/config/mynetwork.py b/xpybar/config/mynetwork.py index 79cd271..ca4e18b 100644 --- a/xpybar/config/mynetwork.py +++ b/xpybar/config/mynetwork.py @@ -5,7 +5,7 @@ from plugins.ping import Ping from common import * class MyNetwork(Entry): - def __init__(self, *args, limits = None, ignore = None, pings = None, **kwargs): + def __init__(self, *args, limits = None, ignore = None, pings = None, renamemap = None, **kwargs): self.limits = { 'rx_bytes' : None # Download speed in bytes (not bits) , 'tx_bytes' : None # Upload speed in bytes (not bits) , 'rx_total' : None # Download cap in bytes @@ -25,7 +25,8 @@ class MyNetwork(Entry): self.pings[nic] = ping[nic] else: self.pings[nic] += ping[nic] - self.ignore = ['lo'] if ignore is None else ignore + self.ignore = ['lo'] if ignore is None else list(ignore) + self.renamemap = renamemap self.net_time = time.monotonic() self.net_last = {} self.show_all = True @@ -36,6 +37,15 @@ class MyNetwork(Entry): 'carrier', 'compressed', 'multicast'] self.in_bytes = False # in bits if showing total Entry.__init__(self, *args, **kwargs) + + def networkOK(self, name): + if name.startswith("docker"): + return False + if name.startswith("zcctun"): + return False + if name.startswith("veth"): + return False + return True; def action(self, col, button, x, y): if button == LEFT_BUTTON: @@ -144,6 +154,7 @@ class MyNetwork(Entry): net_now = time.monotonic() net_tdiff, self.net_time = net_now - self.net_time, net_now network = Network(*self.ignore).devices + network = {self.renamemap.get(dev, dev): stat for dev, stat in network.items() if self.networkOK(dev)} label = self.labels[self.show_value] show_total = label == 'total' show_bytes = label == 'bytes' @@ -184,9 +195,9 @@ class MyNetwork(Entry): return ret if self.show_all: if self.show_name: - net = [create(dev, dev) for dev in network] + net = [create(dev, dev) for dev in network if dev] else: - net = [create(None, dev) for dev in network] + net = [create(None, dev) for dev in network if dev] net = (SEPARATOR if self.show_name else ' ').join(net) else: devsum = {} -- cgit v1.2.3-70-g09d2