Skip to content

Improve device category description #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2025
Merged

Improve device category description #362

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3cd011
Improve device category description
marmarta Jun 5, 2025
5902314
Fix incorrect parent device serialization
marmarta Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions qubesadmin/device_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,16 +647,16 @@

# modems, WiFi and Ethernet adapters
Network = ("u02****", "p0703**", "p02****", "ue0****")
Input = ("u03****", "p09****") # HID etc.
Keyboard = ("u03**01", "p0900**")
Mouse = ("u03**02", "p0902**")
Input = ("u03****", "p09****") # HID etc.
Printer = ("u07****",)
Image_Input = ("p0903**", "u06****", "u0e****") # cameras and scanners
Camera = ("p0903**", "u06****", "u0e****") # cameras and scanners

Microphone = ("m******",)
Audio = ("p0403**", "p0401**", "p0408**", "u01****", "m******")
# Multimedia = Audio, Video, Displays etc.
Multimedia = ("u10****", "p03****", "p04****")
Microphone = ("m******",)
USB_Storage = ("u08****", )
Block_Storage = ("b******", )
Storage = ("b******", "u08****", "p01****")
Expand Down Expand Up @@ -1019,7 +1019,7 @@
else:
for interface in self.interfaces:
if str(interface) != f"{self.devclass.upper()} device":
cat = str(interface)
cat = str(interface).replace("_", " ")
break
else:
cat = f"{self.devclass.upper()} device"
Expand Down Expand Up @@ -1167,13 +1167,13 @@
interfaces = properties["interfaces"]
properties["interfaces"] = DeviceInterface.from_str_bulk(interfaces)

if "parent_ident" in properties:
if "parent_port_id" in properties:
properties["parent"] = Port(
backend_domain=expected_device.backend_domain,
port_id=properties["parent_ident"],
port_id=properties["parent_port_id"],
devclass=properties["parent_devclass"],
)
del properties["parent_ident"]
del properties["parent_port_id"]

Check warning on line 1176 in qubesadmin/device_protocol.py

View check run for this annotation

Codecov / codecov/patch

qubesadmin/device_protocol.py#L1176 

Added line #L1176 was not covered by tests
del properties["parent_devclass"]

return cls(**properties)
Expand Down