From 5f5bf33cbc8a775a29dcd106284a546544e343ff Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 9 Dec 2013 11:58:43 -0800 Subject: [PATCH] Reworked detection thread to use sets more fully. --- alarmdecoder/devices.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/alarmdecoder/devices.py b/alarmdecoder/devices.py index 8d9dfd5..9451d39 100644 --- a/alarmdecoder/devices.py +++ b/alarmdecoder/devices.py @@ -538,16 +538,14 @@ class USBDevice(Device): try: current_devices = set(USBDevice.find_all()) - new_devices = [dev for dev in current_devices if dev not in last_devices] - removed_devices = [dev for dev in last_devices if dev not in current_devices] - last_devices = current_devices - - for dev in new_devices: + for dev in current_devices.difference(last_devices): self.on_attached(device=dev) - for dev in removed_devices: + for dev in last_devices.difference(current_devices): self.on_detached(device=dev) + last_devices = current_devices + except CommError: pass