Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 0f94f9b0

Přidáno uživatelem Pultak před více než 2 roky(ů)

re #9332 Fixed serial number being None

Zobrazit rozdíly:

client/usb_detector/usb_reader.py
1
import logging
2

  
3 1
import usb.core
4 2
import usb.util
5 3

  
......
12 10
    for bus in busses:
13 11
        devices = bus.devices
14 12
        for dev in devices:
13
            serial_number = None
14
            device_info = usb.core.find(idProduct=dev.idProduct)
15 15
            try:
16
                device_info = usb.core.find(idProduct=dev.idProduct)
16
                serial_number = usb.util.get_string(device_info, device_info.iSerialNumber)
17
            except:
18
                # Failed to retrieve information from device
19
                pass
20

  
21
            if serial_number is not None:
17 22
                detected_devices.append({
18 23
                    "vendor_id": dev.idVendor,
19 24
                    "product_id": dev.idProduct,
20
                    "serial_number": usb.util.get_string(device_info, device_info.iSerialNumber)
25
                    "serial_number": serial_number
21 26
                })
22
            except:
23
                logging.warning(f"Failed to retrieve information from device {dev}")
24 27

  
25 28
    return detected_devices

Také k dispozici: Unified diff