Merge pull request #1010 from DrBu7cher/fix-nic-include

fix(modules,core,nix): respect include and exclude correctly when using multiple aliases

bumblebee_status/core/module.py

@@ -211,7 +211,7 @@ def clear_widgets(self):
     """
 
     def add_widget(self, full_text="", name=None, hidden=False):
-        widget_id = "{}::{}".format(self.name, len(self.widgets()))
+        widget_id = "{}::{}".format(self.id, len(self.widgets()))
         widget = core.widget.Widget(full_text=full_text, name=name, widget_id=widget_id, hidden=hidden)
         self.widgets().append(widget)
         widget.module = self

bumblebee_status/modules/core/nic.py

@@ -37,7 +37,9 @@ def __init__(self, config, theme):
         self._exclude = util.format.aslist(
             self.parameter("exclude", "lo,virbr,docker,vboxnet,veth,br,.*:avahi")
         )
-        self._include = util.format.aslist(self.parameter("include", ""))
+
+        include_parameter = self.parameter("include", "")
+        self._include = util.format.aslist(include_parameter) if include_parameter else []
 
         self._states = {"include": [], "exclude": []}
         for state in tuple(
@@ -88,7 +90,7 @@ def state(self, widget):
 
     def _iswlan(self, intf):
         # wifi, wlan, wlp, seems to work for me
-        if intf.startswith("w"):
+        if intf.startswith("w") and not intf.startswith("wg"):
             return True
         return False
 
@@ -105,6 +107,11 @@ def get_addresses(self, intf):
             return []
         return retval
 
+    def _included(self, intf):
+        if not self._include:
+            return True
+        return intf in self._include
+
     def _excluded(self, intf):
         for e in self._exclude:
             if re.match(e, intf):
@@ -115,9 +122,8 @@ def _update_widgets(self, widgets):
         self.clear_widgets()
         interfaces = []
         for i in netifaces.interfaces():
-            if not self._excluded(i):
+            if not self._excluded(i) and self._included(i):
                 interfaces.append(i)
-        interfaces.extend([i for i in netifaces.interfaces() if i in self._include])
 
         for intf in interfaces:
             addr = []