q-dev: less scary device category names

qubesadmin/device_protocol.py

@@ -655,7 +655,7 @@ class DeviceCategory(Enum):
     )
     Wireless = ("ue0****", "p0d****")
     Bluetooth = ("ue00101", "p0d11**")
-    Mass_Data = ("b******", "u08****", "p01****")
+    Storage = ("b******", "u08****", "p01****")
     Network = ("p02****",)
     Memory = ("p05****",)
     PCI_Bridge = ("p06****",)
@@ -770,23 +770,28 @@ def __str__(self):
                 "no subclass",
                 "unused",
                 "undefined",
+                "vendor specific subclass",
             ):
                 # if not, try interface
                 result = self._load_classes(self.devclass).get(
                     self._interface_encoding[1:], None
                 )
             if result is None or result.lower() in (
                 "none",
-                "no subclass",
                 "unused",
                 "undefined",
             ):
                 # if not, try class
                 result = self._load_classes(self.devclass).get(
                     self._interface_encoding[1:-4] + "****", None
                 )
-            if result is None:
-                result = f"Unclassified {self.devclass} device"
+            if result is None or result.lower() in (
+                "none",
+                "unused",
+                "undefined",
+                "vendor specific class",
+            ):
+                result = f"{self.devclass.upper()} device"
             return result
         if self.devclass == "mic":
             return "Microphone"
@@ -974,9 +979,17 @@ def description(self) -> str:
         else:
             vendor = "unknown vendor"
 
-        cat = self.interfaces[0].category.name
-        if cat == "Other":
-            cat = str(self.interfaces[0])
+        for interface in self.interfaces:
+            if interface.category.name != "Other":
+                cat = interface.category.name
+                break
+        else:
+            for interface in self.interfaces:
+                if str(interface) != f"{self.devclass.upper()} device":
+                    cat = str(interface)
+                    break
+            else:
+                cat = f"{self.devclass.upper()} device"
         return f"{cat}: {vendor} {prod}"
 
     @property