RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hidapi: Remove outdated logger enabled checks 

Logger enabled checks clutter the code unnecessarily. The checks are
now handled in a custom logger class. Eventually they can be completely
removed in the future.

Related #2664
This commit is contained in:
MattHag 2025-01-02 14:13:20 +01:00 committed by Peter F. Patel-Schneider
parent d42524dec9
commit 3bf8a85866
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/hidapi/hidapi_impl.py
View File

@ -253,28 +253,25 @@ def _match(
if len(report) == 1 + 6 and report[0] == 0x10: if len(report) == 1 + 6 and report[0] == 0x10:
device["hidpp_short"] = True device["hidpp_short"] = True
except HIDError as e: except HIDError as e:
if logger.isEnabledFor(logging.INFO): logger.info(f"Error opening device {device['path']} ({bus_id}/{vid:04X}/{pid:04X}) for hidpp check: {e}")
logger.info(f"Error opening device {device['path']} ({bus_id}/{vid:04X}/{pid:04X}) for hidpp check: {e}")
try: try:
report = _get_input_report(device_handle, 0x11, 32) report = _get_input_report(device_handle, 0x11, 32)
if len(report) == 1 + 19 and report[0] == 0x11: if len(report) == 1 + 19 and report[0] == 0x11:
device["hidpp_long"] = True device["hidpp_long"] = True
except HIDError as e: except HIDError as e:
if logger.isEnabledFor(logging.INFO): logger.info(f"Error opening device {device['path']} ({bus_id}/{vid:04X}/{pid:04X}) for hidpp check: {e}")
logger.info(f"Error opening device {device['path']} ({bus_id}/{vid:04X}/{pid:04X}) for hidpp check: {e}")
finally: finally:
if device_handle: if device_handle:
close(device_handle) close(device_handle)
if logger.isEnabledFor(logging.INFO): logger.info(
logger.info( "Found device BID %s VID %04X PID %04X HID++ %s %s",
"Found device BID %s VID %04X PID %04X HID++ %s %s", bus_id,
bus_id, vid,
vid, pid,
pid, device["hidpp_short"],
device["hidpp_short"], device["hidpp_long"],
device["hidpp_long"], )
)
if not device["hidpp_short"] and not device["hidpp_long"]: if not device["hidpp_short"] and not device["hidpp_long"]:
return None return None

32
lib/hidapi/udev_impl.py
View File

@ -86,8 +86,7 @@ def _match(action: str, device, filter_func: typing.Callable[[int, int, int, boo
interest to Solaar. It is given the bus id, vendor id, and product interest to Solaar. It is given the bus id, vendor id, and product
id and returns a dictionary with the required hid_driver and id and returns a dictionary with the required hid_driver and
usb_interface and whether this is a receiver or device.""" usb_interface and whether this is a receiver or device."""
if logger.isEnabledFor(logging.DEBUG): logger.debug(f"Dbus event {action} {device}")
logger.debug(f"Dbus event {action} {device}")
hid_device = device.find_parent("hid") hid_device = device.find_parent("hid")
if hid_device is None: # only HID devices are of interest to Solaar if hid_device is None: # only HID devices are of interest to Solaar
return return
@ -137,18 +136,17 @@ def _match(action: str, device, filter_func: typing.Callable[[int, int, int, boo
intf_device = device.find_parent("usb", "usb_interface") intf_device = device.find_parent("usb", "usb_interface")
usb_interface = None if intf_device is None else intf_device.attributes.asint("bInterfaceNumber") usb_interface = None if intf_device is None else intf_device.attributes.asint("bInterfaceNumber")
# print('*** usb interface', action, device, 'usb_interface:', intf_device, usb_interface, interface_number) # print('*** usb interface', action, device, 'usb_interface:', intf_device, usb_interface, interface_number)
if logger.isEnabledFor(logging.INFO): logger.info(
logger.info( "Found device %s BID %s VID %s PID %s HID++ %s %s USB %s %s",
"Found device %s BID %s VID %s PID %s HID++ %s %s USB %s %s", device.device_node,
device.device_node, bid,
bid, vid,
vid, pid,
pid, hidpp_short,
hidpp_short, hidpp_long,
hidpp_long, usb_interface,
usb_interface, interface_number,
interface_number, )
)
if not (hidpp_short or hidpp_long or interface_number is None or interface_number == usb_interface): if not (hidpp_short or hidpp_long or interface_number is None or interface_number == usb_interface):
return return
attrs = intf_device.attributes if intf_device is not None else None attrs = intf_device.attributes if intf_device is not None else None
@ -268,8 +266,7 @@ def monitor_glib(glib: GLib, callback: Callable, filter_func: Callable):
except Exception: except Exception:
glib.io_add_watch(m, glib.IO_IN, _process_udev_event, callback, filter_func) glib.io_add_watch(m, glib.IO_IN, _process_udev_event, callback, filter_func)
if logger.isEnabledFor(logging.DEBUG): logger.debug("Starting dbus monitoring")
logger.debug("Starting dbus monitoring")
m.start() m.start()
@ -282,8 +279,7 @@ def enumerate(filter_func: typing.Callable[[int, int, int, bool, bool], dict[str
:returns: a list of matching ``DeviceInfo`` tuples. :returns: a list of matching ``DeviceInfo`` tuples.
""" """
if logger.isEnabledFor(logging.DEBUG): logger.debug("Starting dbus enumeration")
logger.debug("Starting dbus enumeration")
for dev in pyudev.Context().list_devices(subsystem="hidraw"): for dev in pyudev.Context().list_devices(subsystem="hidraw"):
dev_info = _match(ACTION_ADD, dev, filter_func) dev_info = _match(ACTION_ADD, dev, filter_func)
if dev_info: if dev_info: