difonlib 0.3.0__tar.gz → 0.3.2__tar.gz

{difonlib-0.3.0 → difonlib-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: difonlib
-Version: 0.3.0
+Version: 0.3.2
 Summary: python libraries
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{difonlib-0.3.0 → difonlib-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "difonlib"
-version = "0.3.0"
+version = "0.3.2"
 description = "python libraries"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -51,6 +51,7 @@ dev = [
     "types-pexpect>=4.9.0.20250916",
     "types-PyYAML>=6.0.12.20250915",
     "types-xmltodict>=1.0.1.20250920",
+    "ipython>=8.39.0",
 ]
 
 [tool.ruff]

{difonlib-0.3.0 → difonlib-0.3.2}/src/difonlib/bt_utils.py

@@ -170,19 +170,20 @@ def bt_scan_hid_devs() -> list:
     return hid_devs
 
 
-async def bt_scan_devs(  # universally version for classic and ble devices
+# Universal Bluetooth scanner for classic and BLE devices.
+async def bt_scan_devs(
     dev_type: str = "HID Device",
-    inquiry_warmup: float = 4.0,  # время для Classic Inquiry
-    scan_duration: float = 4.0,  # время bleak сканирования
+    scan_duration_classic: float = 4.0,  # scan time for Classic Inquiry
+    scan_duration_ble: float = 4.0,  # scan time for BLE devs
     adapter_path: str = "/org/bluez/hci0",
 ) -> list[dict]:
     bus = pydbus.SystemBus()
     adapter = bus.get("org.bluez", adapter_path)
     adapter.SetDiscoveryFilter({})
     adapter.StartDiscovery()
-    await asyncio.sleep(inquiry_warmup)
+    await asyncio.sleep(scan_duration_classic)
     try:
-        bt_scanner = BluetoothScanner(duration=scan_duration, dev_type=dev_type)
+        bt_scanner = BluetoothScanner(duration=scan_duration_ble, dev_type=dev_type)
         bt_devices = await bt_scanner.run()
     except Exception as e:
         print(f"  Bluetooth scan failed: {e}")

difonlib-0.3.2/src/difonlib/conn_kbd_devs.py

@@ -0,0 +1,65 @@
+import evdev
+from evdev import ecodes, InputDevice
+
+NOT_KBD_KEYWORDS = [
+    "mouse",
+    "hd-audio",
+    "headset",
+    # "headphone",
+    "system control",
+    "video bus",
+    "power button",
+    "avrcp",
+]
+
+
+def get_keyboard_like_devices() -> list[InputDevice]:
+    devices = [evdev.InputDevice(path) for path in evdev.list_devices()]
+    keyboard_likes = []
+    for device in devices:
+        caps = device.capabilities()
+        if evdev.ecodes.EV_KEY not in caps:
+            continue
+        name_lower = device.name.lower()
+        if any(kw in name_lower for kw in NOT_KBD_KEYWORDS):
+            continue
+        keyboard_likes.append(device)
+    return keyboard_likes
+
+
+def is_remote_ctrl(dev: InputDevice) -> bool:
+    caps = dev.capabilities()
+    if ecodes.EV_KEY not in caps:
+        return False
+    keys = set(caps[ecodes.EV_KEY])
+    remote_keys = {
+        ecodes.KEY_UP,
+        ecodes.KEY_DOWN,
+        ecodes.KEY_LEFT,
+        ecodes.KEY_RIGHT,
+        # ecodes.KEY_OK,
+        # ecodes.KEY_SELECT,
+        # ecodes.KEY_BACK,
+        # ecodes.KEY_PLAYPAUSE,
+        # ecodes.KEY_VOLUMEUP,
+        # ecodes.KEY_VOLUMEDOWN,
+        # ecodes.KEY_HOME,
+        # ecodes.KEY_MENU,
+        # ecodes.KEY_NEXT,
+        # ecodes.KEY_PREVIOUS,
+    }
+    return bool(remote_keys & keys)
+
+
+if __name__ == "__main__":
+    print(f"{'Path':<18} | {'Name'}")
+    print("-" * 60)
+
+    idevs = [evdev.InputDevice(path) for path in evdev.list_devices()]
+    for dev in idevs:
+        if is_remote_ctrl(dev):
+            print(f"{dev.path:<18} | {dev.name}")
+    print("-" * 60)
+    print("-" * 60)
+    for dev in get_keyboard_like_devices():
+        print(f"{dev.path:<18} | {dev.name}")

{difonlib-0.3.0 → difonlib-0.3.2}/src/difonlib/input_devs.py

@@ -12,9 +12,6 @@ dbg = logdbg
 
 # import asyncio
 
-KEY_LONG_PRESSED = 1000
-KEY_LONG_TIME_HOLD = 0.7
-
 
 @dataclass
 class IDevKbd:
@@ -36,7 +33,7 @@ def idev_get_connected_devs() -> List[InputDevice]:
     return [InputDevice(p) for p in list_devices()]
 
 
-def is_remote_ctrl(dev: InputDevice) -> bool:
+def has_keys(dev: InputDevice) -> bool:
     caps = dev.capabilities()
     if ecodes.EV_KEY not in caps:
         return False
@@ -46,22 +43,43 @@ def is_remote_ctrl(dev: InputDevice) -> bool:
         ecodes.KEY_DOWN,
         ecodes.KEY_LEFT,
         ecodes.KEY_RIGHT,
-        ecodes.KEY_OK,
-        ecodes.KEY_SELECT,
-        ecodes.KEY_BACK,
-        ecodes.KEY_PLAYPAUSE,
-        ecodes.KEY_VOLUMEUP,
-        ecodes.KEY_VOLUMEDOWN,
-        ecodes.KEY_HOME,
-        ecodes.KEY_MENU,
+        # ecodes.KEY_OK,
+        # ecodes.KEY_SELECT,
+        # ecodes.KEY_BACK,
+        # ecodes.KEY_PLAYPAUSE,
+        # ecodes.KEY_VOLUMEUP,
+        # ecodes.KEY_VOLUMEDOWN,
+        # ecodes.KEY_HOME,
+        # ecodes.KEY_MENU,
+        # ecodes.KEY_NEXT,
+        # ecodes.KEY_PREVIOUS,
     }
     return bool(remote_keys & keys)
 
 
-def idev_get_dev_by_uniq(uniq: str) -> Optional[InputDevice]:
-    devs = idev_get_connected_devs()
-    matched = [dev for dev in devs if dev.uniq.upper() == uniq.upper() and is_remote_ctrl(dev)]
-    return matched[0] if matched else None
+def idev_get_connected_kbds(uniqs: list[str] | None = None) -> list[InputDevice]:
+    """Use in asyc:
+    1. connected_hid_devs = await asyncio.to_thread(idev_get_connected_kbds)
+    2. connected_hid_devs = await asyncio.to_thread(lambda: idev_get_connected_kbds(['11:2a:3b:44:55:6c', 'F1:ba:3b:41:52:6e']))
+    """
+    result = []
+    _uniqs = [u.lower() for u in uniqs] if uniqs else []
+    for path in list_devices():
+        try:
+            dev = InputDevice(path)
+            if has_keys(dev):
+                if uniqs:
+                    if dev.uniq.lower() in _uniqs:
+                        result.append(dev)
+                    else:
+                        dev.close()
+                else:
+                    result.append(dev)
+            else:
+                dev.close()
+        except (OSError, PermissionError):
+            continue
+    return result
 
 
 def get_connected_input_devices() -> List[Dict[str, Any]]:
@@ -220,27 +238,77 @@ if __name__ == "__main__":
     # print_dicts_list(devs)
     # dbg(f"---------------------------------------------")  # //Dima
     # exit()
-    # devs = idev_get_dev_by_uniq("40:B4:cd:CE:31:d6")
+    # devs = idev_kbd_get_by_uniq("40:B4:cd:CE:31:d6")
     # print(f"devs: {devs}")
     # exit()
-
-    devs = idev_get_by_field("Name", "Keychron Keychron K5")
-    if devs:
-        for dev in devs:
-            dbg(f"dev: {dev.__dict__}")  # //Dima
-
-    devs = idev_get_by_field(field="Uniq", field_value="40:b4:cd:ce:31:d6")
-    # print(repr(f"dev: {dev.__dict__}"))
-    if devs:
-        dev = devs[0]
-        dbg(f"Input dev: {dev.__dict__}")
-
-        key = idev_key_monitor(dev.event)
-        dbg(f"Pressed key: {key.__dict__}")
-
-        key = asyncio.run(idev_get_pressed_key(dev.event))
-        if key:
-            dbg(f"Pressed key: {key}")
-            dbg(f"Pressed key: {key.__dict__}")
+    # monitored_devs = [
+    #     "40:b4:cd:ce:31:d6",  # Amazon Fire TV Remote
+    #     "ff:23:05:30:30:8c",  # HID Remote01
+    #     "c1:03:01:5a:02:95",  # BOXPUT BPR1 c1:03:01:5c:02:95
+    # ]
+
+    for dev in idev_get_connected_kbds():
+        print(f"{dev.path:<18} | {dev.name}")
+
+    import asyncio
+    import functools
+
+    async def test_idev_get_connected_kbds(
+        uniqs: list[str] | None = None,
+    ) -> list[InputDevice]:
+        return await asyncio.to_thread(lambda: idev_get_connected_kbds(uniqs))
+
+    async def testA_idev_get_connected_kbds(
+        uniqs: list[str] | None = None,
+    ) -> list[InputDevice]:
+        return await asyncio.to_thread(functools.partial(idev_get_connected_kbds, uniqs))
+
+    async def test2_idev_get_connected_kbds() -> list[InputDevice]:
+        return await asyncio.get_running_loop().run_in_executor(None, idev_get_connected_kbds)
+
+    print("-" * 65)
+    con_devs = asyncio.run(test_idev_get_connected_kbds())
+    print(f"con_devs: {[dev.name for dev in con_devs]}")
+    print("-" * 55)
+    con_devs = asyncio.run(test2_idev_get_connected_kbds())
+    print(f"con_devs: {[dev.name for dev in con_devs]}")
+    print("-" * 55)
+    con_devs = asyncio.run(
+        testA_idev_get_connected_kbds(uniqs=["40:b4:cd:ce:31:d6", "c1:03:01:5c:02:95"])
+    )
+    print(f"con_devs: {[(dev.name, dev.uniq) for dev in con_devs]}")
+    """
+    https://claude.ai/share/342dbe4e-3eff-4732-8249-bd68837c6fba
+       Oба варианта корректны и делают одно и то же. Разница чисто косметическая:
+    asyncio.to_thread — это обёртка над run_in_executor(None, ...),
+    добавленная в Python 3.9 именно чтобы не писать get_running_loop() вручную.
+    Используй to_thread — он чище и современнее.
+    run_in_executor оставь для случаев когда нужен кастомный executor (например ThreadPoolExecutor с лимитом потоков).
+    
+       Передача параметров:
+    await asyncio.to_thread(
+        lambda: idev_get_connected_kbds(uniqs=["aa:bb:cc:dd:ee:ff"])
+    )
+    import functools
+    await asyncio.to_thread(functools.partial(idev_get_connected_kbds, uniqs=["aa:bb:cc:dd:ee:ff"]))
+    """
+    # devs = idev_get_by_field("Name", "Keychron Keychron K5")
+    # if devs:
+    #     for dev in devs:
+    #         dbg(f"dev: {dev.__dict__}")  # //Dima
+
+    # devs = idev_get_by_field(field="Uniq", field_value="40:b4:cd:ce:31:d6")
+    # # print(repr(f"dev: {dev.__dict__}"))
+    # if devs:
+    #     dev = devs[0]
+    #     dbg(f"Input dev: {dev.__dict__}")
+
+    #     key = idev_key_monitor(dev.event)
+    #     dbg(f"Pressed key: {key.__dict__}")
+
+    #     key = asyncio.run(idev_get_pressed_key(dev.event))
+    #     if key:
+    #         dbg(f"Pressed key: {key}")
+    #         dbg(f"Pressed key: {key.__dict__}")
 
     dbg(" == FINISH ==")  # //Dima

{difonlib-0.3.0 → difonlib-0.3.2}/src/difonlib/ng_lib.py

@@ -45,7 +45,10 @@ class CardTable:
             ).classes("w-full shadow-lg bg-black-900 text-gray-200")
 
             # --- Диалог подтверждения ---
-            with ui.dialog() as self.confirm_dialog, ui.card().classes("p-4"):
+            with (
+                ui.dialog().props("persistent") as self.confirm_dialog,
+                ui.card().classes("p-4"),
+            ):
                 self.dialog_title = ui.label().classes("text-lg font-bold mb-4")
                 with ui.row().classes("justify-end w-full gap-2"):
                     ui.button("No", color="gray", on_click=self.confirm_dialog.close)
@@ -53,7 +56,7 @@ class CardTable:
 
             # --- Диалог "Processing..." ---
             with (
-                ui.dialog() as self.processing_dialog,
+                ui.dialog().props("persistent") as self.processing_dialog,
                 ui.card().classes("p-4 items-center justify-center"),
             ):
                 with ui.row().classes("items-center gap-3"):

{difonlib-0.3.0 → difonlib-0.3.2}/src/difonlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: difonlib
-Version: 0.3.0
+Version: 0.3.2
 Summary: python libraries
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{difonlib-0.3.0 → difonlib-0.3.2}/src/difonlib.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ pyproject.toml
 src/difonlib/__init__.py
 src/difonlib/bt_scanner.py
 src/difonlib/bt_utils.py
+src/difonlib/conn_kbd_devs.py
 src/difonlib/input_devs.py
 src/difonlib/ng_lib.py
 src/difonlib/py.typed