sdwire 0.2.2__tar.gz → 0.2.4__tar.gz

{sdwire-0.2.2 → sdwire-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sdwire
-Version: 0.2.2
+Version: 0.2.4
 Summary: CLI application to interact with Badgerd SDWire devices
 License: GPL-3
 Author: Talha Can Havadar
@@ -9,11 +9,10 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: adafruit-board-toolkit (>=1.1.1,<2.0.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
-Requires-Dist: pyftdi (>=0.55.4,<0.56.0)
+Requires-Dist: pyftdi (>=0.56.0,<0.57.0)
+Requires-Dist: pyudev (>=0.24.3,<0.25.0)
 Requires-Dist: pyusb (>=1.2.1,<2.0.0)
-Requires-Dist: semver (>=3.0.2,<4.0.0)
 Description-Content-Type: text/markdown
 
 # CLI for Badgerd SDWire Devices

{sdwire-0.2.2 → sdwire-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sdwire"
-version = "0.2.2"
+version = "0.2.4"
 description = "CLI application to interact with Badgerd SDWire devices"
 authors = ["Talha Can Havadar <havadartalha@gmail.com>"]
 license = "GPL-3"
@@ -10,10 +10,9 @@ packages = [{ include = "sdwire" }]
 [tool.poetry.dependencies]
 python = "^3.12"
 click = "^8.1.7"
-adafruit-board-toolkit = "^1.1.1"
-semver = "^3.0.2"
 pyusb = "^1.2.1"
-pyftdi = "^0.55.4"
+pyftdi = "^0.56.0"
+pyudev = "^0.24.3"
 
 
 [tool.poetry.group.dev.dependencies]

{sdwire-0.2.2 → sdwire-0.2.4}/sdwire/backend/detect.py

@@ -1,13 +1,12 @@
 import logging
 from typing import List
-from adafruit_board_toolkit import circuitpython_serial as cpserial
-from serial.tools.list_ports_common import ListPortInfo
 
 from sdwire import constants
 from .device.sdwire import SDWire, SDWIRE_GENERATION_SDWIRE3
 from .device.sdwirec import SDWireC
 from .device.usb_device import PortInfo
 
+import pyudev
 import usb.core
 import usb.util
 from usb.core import Device
@@ -46,30 +45,31 @@ def get_sdwirec_devices() -> List[SDWireC]:
 
 
 def get_sdwire_devices() -> List[SDWire]:
-
     # Badgerd SDWire3
     # VID = 0bda PID = 0316
     # Badgerd SDWireC
     # VID = 0x04e8 PID = 0x6001
     result = []
-    devices: List[Device] = usb.core.find(find_all=True)
+    devices: List[Device] = pyudev.Context().list_devices(
+        subsystem="usb",
+        ID_VENDOR_ID=f"{constants.SDWIRE3_VID:04x}",
+        ID_MODEL_ID=f"{constants.SDWIRE3_PID:04x}",
+    )
     if not devices:
         log.info("no usb devices found while searching for SDWire..")
         return []
 
-    device_list = []
     for device in devices:
         product = None
         serial = None
-        manufacturer = None
+        bus = None
+        address = None
         try:
-            product = device.idProduct
-            vendor = device.idVendor
-            serial = (
-                usb.util.get_string(device, device.iSerialNumber, None)
-                + f"{device.bus}{device.port_number}"
-            )
-            manufacturer = device.manufacturer
+            product = int(f"0x{device.get('ID_MODEL_ID')}", 16)
+            vendor = int(f"0x{device.get('ID_VENDOR_ID')}", 16)
+            bus = int(device.get("BUSNUM"))
+            address = int(device.get("DEVNUM"))
+            serial = f"{device.get('ID_USB_SERIAL_SHORT')}:{bus}.{address}"
         except Exception as e:
             log.debug(
                 "not able to get usb product, serial_number and manufacturer information, err: %s",
@@ -77,9 +77,12 @@ def get_sdwire_devices() -> List[SDWire]:
             )
 
         if product == constants.SDWIRE3_PID and vendor == constants.SDWIRE3_VID:
+            usb_device: List[Device] = usb.core.find(
+                idVendor=vendor, idProduct=product, bus=bus, address=address
+            )
             result.append(
                 SDWire(
-                    port_info=PortInfo(device, product, vendor, serial, device),
+                    port_info=PortInfo(device, product, vendor, serial, usb_device),
                     generation=SDWIRE_GENERATION_SDWIRE3,
                 )
             )

{sdwire-0.2.2 → sdwire-0.2.4}/sdwire/backend/device/sdwire.py

@@ -1,5 +1,4 @@
 import logging
-from serial import Serial
 from .usb_device import USBDevice, PortInfo
 
 log = logging.getLogger(__name__)
@@ -8,10 +7,18 @@ SDWIRE_GENERATION_SDWIRE3 = 2
 
 
 class SDWire(USBDevice):
+    __block_dev = None
 
     def __init__(self, port_info: PortInfo, generation: int):
         super().__init__(port_info)
         self.generation = generation
+        for sibling in self.dev_string.parent.children:
+            if (
+                self.dev_string.device_path != sibling.device_path
+                and sibling.device_type == "disk"
+            ):
+                self.__block_dev = f"/dev/{sibling.device_path.split('/')[-1]}"
+                break
 
     def switch_ts(self):
         try:
@@ -33,8 +40,12 @@ class SDWire(USBDevice):
                 e,
             )
 
+    @property
+    def block_dev(self):
+        return self.__block_dev
+
     def __str__(self):
-        return f"{self.serial_string}\t[{int(self.manufacturer_string):04x}::{int(self.product_string):04x}]"
+        return f"{self.serial_string}\t[{int(self.manufacturer_string):04x}::{int(self.product_string):04x}]\t\t{self.block_dev}"
 
     def __repr__(self):
         return self.__str__()

{sdwire-0.2.2 → sdwire-0.2.4}/sdwire/backend/device/sdwirec.py

@@ -1,24 +1,37 @@
 import logging
 from pyftdi.ftdi import Ftdi
-from serial import Serial
 from .usb_device import USBDevice, PortInfo
 
 log = logging.getLogger(__name__)
 
 
 class SDWireC(USBDevice):
+    __block_dev = None
 
     def __init__(self, port_info: PortInfo):
         super().__init__(port_info)
+        for d in self._pyudev_context.list_devices(ID_MODEL="sd-wire"):
+            d_serial = d.get("ID_USB_SERIAL_SHORT", None)
+            if d_serial is not None and d_serial == self.serial_string:
+                for sibling in d.parent.children:
+                    if (
+                        d.device_path != sibling.device_path
+                        and sibling.device_type == "disk"
+                    ):
+                        self.__block_dev = f"/dev/{sibling.device_path.split('/')[-1]}"
+                        break
+                break
 
     def __str__(self):
-        return (
-            f"{self.serial_string}\t[{self.product_string}::{self.manufacturer_string}]"
-        )
+        return f"{self.serial_string}\t[{self.product_string}::{self.manufacturer_string}]\t{self.block_dev}"
 
     def __repr__(self):
         return self.__str__()
 
+    @property
+    def block_dev(self):
+        return self.__block_dev
+
     def switch_ts(self):
         self._set_sdwire(1)
 

{sdwire-0.2.2 → sdwire-0.2.4}/sdwire/backend/device/usb_device.py

@@ -1,5 +1,5 @@
 from collections import namedtuple
-from serial.tools.list_ports_common import ListPortInfo
+import pyudev
 
 PortInfo = namedtuple(
     "PortInfo", ("device", "product", "manufacturer", "serial", "usb_device")
@@ -8,9 +8,11 @@ PortInfo = namedtuple(
 
 class USBDevice:
     __port_info = None
+    _pyudev_context = None
 
     def __init__(self, port_info: PortInfo):
         self.__port_info = port_info
+        self._pyudev_context = pyudev.Context()
 
     @property
     def usb_device(self):

{sdwire-0.2.2 → sdwire-0.2.4}/sdwire/backend/utils.py

@@ -20,9 +20,11 @@ def handle_switch_target_command(ctx):
 
 def handle_switch_off_command(ctx):
     device = ctx.obj["device"]
-    if isinstance(device, SDWireC):
-        log.info("SDWireC or legacy sdwire devices dont have off functionality")
-        print("SDWireC dont have off functionality")
+    if isinstance(device, SDWireC) or isinstance(device, SDWire):
+        log.info(
+            "SDWire3, SDWireC or legacy sdwire devices dont have off functionality"
+        )
+        print("SDWireC and SDWire3 dont have off functionality implemented")
         sys.exit(1)
 
 

{sdwire-0.2.2 → sdwire-0.2.4}/sdwire/main.py

@@ -1,19 +1,20 @@
 #!/usr/bin/env python
+import logging
 import click
 from .backend import utils
 from .backend import detect
-from .backend.device.sdwire import SDWire
 
 
 @click.group()
-def main():
-    pass
+@click.option("--debug", required=False, is_flag=True, help="Enable debug output")
+def main(debug=None):
+    if debug:
+        logging.basicConfig(level=logging.DEBUG)
 
 
 @main.command()
 def list():
-
-    print(f"Serial\t\t\tProduct Info")
+    print("Serial\t\t\tProduct Info\t\tBlock Dev")
     for sdwire in detect.get_sdwire_devices():
         print(sdwire)
 
@@ -88,10 +89,5 @@ def off(ctx: click.Context):
     utils.handle_switch_off_command(ctx)
 
 
-# investigate further to use click in circuitpython
-# def invoke():
-#     main.main("switch ts".split(), "sdwire", "_SDWIRE_COMPLETE")
-
-
 if __name__ == "__main__":
     main()