diff --git a/lib/solaar/configuration.py b/lib/solaar/configuration.py index c0c060c8e..e0b4bb4f0 100644 --- a/lib/solaar/configuration.py +++ b/lib/solaar/configuration.py @@ -62,8 +62,7 @@ def _load(): loaded_config = _convert_json(loaded_config) else: path = None - if logger.isEnabledFor(logging.DEBUG): - logger.debug("load => %s", loaded_config) + logger.debug("load => %s", loaded_config) global _config _config = _parse_config(loaded_config, path) @@ -78,14 +77,13 @@ def _parse_config(loaded_config, config_path): loaded_version = loaded_config[0] discard_derived_properties = loaded_version != current_version if discard_derived_properties: - if logger.isEnabledFor(logging.INFO): - logger.info( - "config file '%s' was generated by another version of solaar " - "(config: %s, current: %s). refreshing detected device capabilities", - config_path, - loaded_version, - current_version, - ) + logger.info( + "config file '%s' was generated by another version of solaar " + "(config: %s, current: %s). refreshing detected device capabilities", + config_path, + loaded_version, + current_version, + ) for device in loaded_config[1:]: assert isinstance(device, dict) @@ -154,8 +152,7 @@ def do_save(): try: with open(_yaml_file_path, "w") as config_file: yaml.dump(_config, config_file, default_flow_style=None, width=150) - if logger.isEnabledFor(logging.INFO): - logger.info("saved %s to %s", _config, _yaml_file_path) + logger.info("saved %s to %s", _config, _yaml_file_path) except Exception as e: logger.error("failed to save to %s: %s", _yaml_file_path, e) @@ -251,11 +248,9 @@ def match(wpid, serial, modelId, unitId, c): break if not entry: if not device.online: # don't create entry for offline devices - if logger.isEnabledFor(logging.INFO): - logger.info("not setting up persister for offline device %s", device._name) + logger.info("not setting up persister for offline device %s", device._name) return - if logger.isEnabledFor(logging.INFO): - logger.info("setting up persister for device %s", device.name) + logger.info("setting up persister for device %s", device.name) entry = _DeviceEntry() _config.append(entry) entry.update(device.name, device.wpid, device.serial, modelId, unitId) diff --git a/lib/solaar/dbus.py b/lib/solaar/dbus.py index ff4e58a69..142b5904f 100644 --- a/lib/solaar/dbus.py +++ b/lib/solaar/dbus.py @@ -68,8 +68,7 @@ def watch_suspend_resume( dbus_interface=_LOGIND_INTERFACE, path=_LOGIND_PATH, ) - if logger.isEnabledFor(logging.INFO): - logger.info("connected to system dbus, watching for suspend/resume events") + logger.info("connected to system dbus, watching for suspend/resume events") _BLUETOOTH_PATH_PREFIX = "/org/bluez/hci0/dev_" diff --git a/lib/solaar/gtk.py b/lib/solaar/gtk.py index 9d9aea623..0361e96c9 100755 --- a/lib/solaar/gtk.py +++ b/lib/solaar/gtk.py @@ -134,9 +134,8 @@ def _parse_arguments(): logging.getLogger("").addHandler(stream_handler) if not args.action: - if logger.isEnabledFor(logging.INFO): - language, encoding = locale.getlocale() - logger.info("version %s, language %s (%s)", __version__, language, encoding) + language, encoding = locale.getlocale() + logger.info("version %s, language %s (%s)", __version__, language, encoding) return args diff --git a/lib/solaar/listener.py b/lib/solaar/listener.py index 384651014..f46a9ffa7 100644 --- a/lib/solaar/listener.py +++ b/lib/solaar/listener.py @@ -79,15 +79,13 @@ def __init__(self, receiver, status_changed_callback): receiver.status_callback = self._status_changed def has_started(self): - if logger.isEnabledFor(logging.INFO): - logger.info("%s: notifications listener has started (%s)", self.receiver, self.receiver.handle) + logger.info("%s: notifications listener has started (%s)", self.receiver, self.receiver.handle) nfs = self.receiver.enable_connection_notifications() - if logger.isEnabledFor(logging.WARNING): - if not self.receiver.isDevice and not ((nfs if nfs else 0) & hidpp10_constants.NotificationFlag.WIRELESS.value): - logger.warning( - "Receiver on %s might not support connection notifications, GUI might not show its devices", - self.receiver.path, - ) + if not self.receiver.isDevice and not ((nfs if nfs else 0) & hidpp10_constants.NotificationFlag.WIRELESS.value): + logger.warning( + "Receiver on %s might not support connection notifications, GUI might not show its devices", + self.receiver.path, + ) self.receiver.notification_flags = nfs self.receiver.notify_devices() self._status_changed(self.receiver) @@ -95,8 +93,7 @@ def has_started(self): def has_stopped(self): r, self.receiver = self.receiver, None assert r is not None - if logger.isEnabledFor(logging.INFO): - logger.info("%s: notifications listener has stopped", r) + logger.info("%s: notifications listener has stopped", r) # because udev is not notifying us about device removal, make sure to clean up in _all_listeners _all_listeners.pop(r.path, None) @@ -144,8 +141,7 @@ def _status_changed(self, device, alert=None, reason=None): if not device: # Device was unpaired, and isn't valid anymore. # We replace it with a ghost so that the UI has something to work with while cleaning up. - if logger.isEnabledFor(logging.INFO): - logger.info("device %s was unpaired, ghosting", device) + logger.info("device %s was unpaired, ghosting", device) device = _ghost(device) self.status_changed_callback(device, alert, reason) @@ -163,20 +159,17 @@ def _notifications_handler(self, n): # a notification that came in to the device listener - strange, but nothing needs to be done here if self.receiver.isDevice: - if logger.isEnabledFor(logging.DEBUG): - logger.debug("Notification %s via device %s being ignored.", n, self.receiver) + logger.debug("Notification %s via device %s being ignored.", n, self.receiver) return # DJ pairing notification - ignore - hid++ 1.0 pairing notification is all that is needed if n.sub_id == 0x41 and n.report_id == base.DJ_MESSAGE_ID: - if logger.isEnabledFor(logging.INFO): - logger.info("ignoring DJ pairing notification %s", n) + logger.info("ignoring DJ pairing notification %s", n) return # a device notification if not (0 < n.devnumber <= 16): # some receivers have devices past their max # devices - if logger.isEnabledFor(logging.WARNING): - logger.warning("Unexpected device number (%s) in notification %s.", n.devnumber, n) + logger.warning("Unexpected device number (%s) in notification %s.", n.devnumber, n) return already_known = n.devnumber in self.receiver @@ -221,8 +214,7 @@ def _notifications_handler(self, n): # Apply settings every time the device connects if n.sub_id == 0x41: - if logger.isEnabledFor(logging.INFO): - logger.info("connection %s for device wpid %s kind %s serial %s", n, dev.wpid, dev.kind, dev._serial) + logger.info("connection %s for device wpid %s kind %s serial %s", n, dev.wpid, dev.kind, dev._serial) # If there are saved configs, bring the device's settings up-to-date. # They will be applied when the device is marked as online. configuration.attach_to(dev) @@ -234,10 +226,8 @@ def _notifications_handler(self, n): if self.receiver.pairing.lock_open and not already_known: # this should be the first notification after a device was paired - if logger.isEnabledFor(logging.WARNING): - logger.warning("first notification was not a connection notification") - if logger.isEnabledFor(logging.INFO): - logger.info("%s: pairing detected new device", self.receiver) + logger.warning("first notification was not a connection notification") + logger.info("%s: pairing detected new device", self.receiver) self.receiver.pairing.new_device = dev elif dev.online is None: dev.ping() @@ -253,19 +243,16 @@ def _process_bluez_dbus(device: Device, path, dictionary: dict, signature): if device: if dictionary.get("Connected") is not None: connected = dictionary.get("Connected") - if logger.isEnabledFor(logging.INFO): - logger.info("bluez dbus for %s: %s", device, "CONNECTED" if connected else "DISCONNECTED") + logger.info("bluez dbus for %s: %s", device, "CONNECTED" if connected else "DISCONNECTED") device.changed(connected, reason=i18n._("connected") if connected else i18n._("disconnected")) elif device is not None: - if logger.isEnabledFor(logging.INFO): - logger.info("bluez cleanup for %s", device) + logger.info("bluez cleanup for %s", device) _cleanup_bluez_dbus(device) def _cleanup_bluez_dbus(device: Device): """Remove dbus signal receiver for device""" - if logger.isEnabledFor(logging.INFO): - logger.info("bluez cleanup for %s", device) + logger.info("bluez cleanup for %s", device) dbus.watch_bluez_connect(device.hid_serial, None) @@ -296,8 +283,7 @@ def _start(device_info: DeviceInfo): def start_all(): stop_all() # just in case this it called twice in a row... - if logger.isEnabledFor(logging.INFO): - logger.info("starting receiver listening threads") + logger.info("starting receiver listening threads") for device_info in base.receivers_and_devices(): _process_receiver_event(ACTION_ADD, device_info) @@ -306,8 +292,7 @@ def stop_all(): listeners = list(_all_listeners.values()) _all_listeners.clear() if listeners: - if logger.isEnabledFor(logging.INFO): - logger.info("stopping receiver listening threads %s", listeners) + logger.info("stopping receiver listening threads %s", listeners) for listener_thread in listeners: listener_thread.stop() configuration.save() @@ -319,8 +304,7 @@ def stop_all(): # after a resume, the device may have been off so mark its saved status to ensure # that the status is pushed to the device when it comes back def ping_all(resuming=False): - if logger.isEnabledFor(logging.INFO): - logger.info("ping all devices%s", " when resuming" if resuming else "") + logger.info("ping all devices%s", " when resuming" if resuming else "") for listener_thread in _all_listeners.values(): if listener_thread.receiver.isDevice: if resuming: @@ -363,8 +347,7 @@ def _process_add(device_info: DeviceInfo, retry): if e.errno == errno.EACCES: try: output = subprocess.check_output(["/usr/bin/getfacl", "-p", device_info.path], text=True) - if logger.isEnabledFor(logging.WARNING): - logger.warning("Missing permissions on %s\n%s.", device_info.path, output) + logger.warning("Missing permissions on %s\n%s.", device_info.path, output) except Exception: pass if retry: @@ -382,8 +365,7 @@ def _process_receiver_event(action, device_info): assert action is not None assert device_info is not None assert _error_callback - if logger.isEnabledFor(logging.INFO): - logger.info("receiver event %s %s", action, device_info) + logger.info("receiver event %s %s", action, device_info) # whatever the action, stop any previous receivers at this path listener_thread = _all_listeners.pop(device_info.path, None) if listener_thread is not None: diff --git a/lib/solaar/tasks.py b/lib/solaar/tasks.py index 195cfa5ab..0b13685a4 100644 --- a/lib/solaar/tasks.py +++ b/lib/solaar/tasks.py @@ -46,8 +46,7 @@ def stop(self): def run(self): self.alive = True - if logger.isEnabledFor(logging.DEBUG): - logger.debug("started") + logger.debug("started") while self.alive: task = self.queue.get() @@ -59,5 +58,4 @@ def run(self): except Exception: logger.exception("calling %s", function) - if logger.isEnabledFor(logging.DEBUG): - logger.debug("stopped") + logger.debug("stopped")