something-x-dev 1.6.0.dev13__tar.gz → 1.7.0.dev15__tar.gz

{something_x_dev-1.6.0.dev13/something_x_dev.egg-info → something_x_dev-1.7.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.6.0.dev13
+Version: 1.7.0.dev15
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT
@@ -16,9 +16,10 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyGObject>=3.42
-Requires-Dist: dbus-python>=1.3
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Dynamic: license-file
 
 <div align="center">
@@ -32,6 +33,8 @@ Built for [Omarchy](https://omarchy.org) · GTK4 · Pure black · JetBrains Mono
 [![AUR](https://img.shields.io/aur/version/something-x?color=red)](https://aur.archlinux.org/packages/something-x)
 [![License: MIT](https://img.shields.io/badge/license-MIT-red.svg)](LICENSE)
 [![Platform](https://img.shields.io/badge/platform-Linux-lightgrey)](https://github.com/SoaOaoS/something-x)
+[![CI](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml/badge.svg)](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml)
+[![Coverage](https://img.shields.io/badge/coverage-tracked-red)](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml)
 
 </div>
 

{something_x_dev-1.6.0.dev13 → something_x_dev-1.7.0.dev15}/README.md

@@ -9,6 +9,8 @@ Built for [Omarchy](https://omarchy.org) · GTK4 · Pure black · JetBrains Mono
 [![AUR](https://img.shields.io/aur/version/something-x?color=red)](https://aur.archlinux.org/packages/something-x)
 [![License: MIT](https://img.shields.io/badge/license-MIT-red.svg)](LICENSE)
 [![Platform](https://img.shields.io/badge/platform-Linux-lightgrey)](https://github.com/SoaOaoS/something-x)
+[![CI](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml/badge.svg)](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml)
+[![Coverage](https://img.shields.io/badge/coverage-tracked-red)](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml)
 
 </div>
 

something_x_dev-1.7.0.dev15/nothing_app/__init__.py

@@ -0,0 +1,21 @@
+from importlib.metadata import version as _pkg_version, PackageNotFoundError as _PNF
+
+
+def _resolve_version() -> str:
+    for pkg in ("something-x", "something-x-dev"):
+        try:
+            return _pkg_version(pkg)
+        except _PNF:
+            pass
+    try:
+        import tomllib
+        import pathlib
+
+        data = tomllib.loads((pathlib.Path(__file__).parent.parent / "pyproject.toml").read_text())
+        return data["project"]["version"] + "+src"
+    except Exception:
+        return "0.0.0+dev"
+
+
+__version__ = _resolve_version()
+APP_ID = "com.something.x.omarchy"

{something_x_dev-1.6.0.dev13 → something_x_dev-1.7.0.dev15}/nothing_app/application.py

@@ -222,13 +222,17 @@ def _run_cli(argv: list[str]) -> int:
 
 
 def _print_help():
+    from . import __version__
+
     print(
-        "Usage:\n"
+        f"Something X {__version__}\n"
+        "\nUsage:\n"
         "  something-x                             launch GUI\n"
         "  something-x --battery                   print battery levels\n"
         "  something-x --anc off|on|transparency   set ANC mode\n"
         "  something-x --eq balanced|bass|treble|voice  set EQ preset\n"
         "  something-x --device AA:BB:CC:DD:EE:FF  target specific device\n"
+        "  something-x --version                   print version and exit\n"
     )
 
 
@@ -240,6 +244,12 @@ def main():
         _print_help()
         sys.exit(0)
 
+    if "--version" in argv or "-V" in argv:
+        from . import __version__
+
+        print(f"something-x {__version__}")
+        sys.exit(0)
+
     if any(f in argv for f in cli_flags):
         sys.exit(_run_cli(argv))
 

something_x_dev-1.7.0.dev15/nothing_app/bluetooth.py

@@ -0,0 +1,384 @@
+from gi.repository import Gio, GLib, GObject
+
+BLUEZ_SERVICE = "org.bluez"
+ADAPTER_IFACE = "org.bluez.Adapter1"
+DEVICE_IFACE = "org.bluez.Device1"
+BATTERY_IFACE = "org.bluez.Battery1"
+OBJ_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
+PROPERTIES_IFACE = "org.freedesktop.DBus.Properties"
+
+NOTHING_PATTERNS = (
+    "nothing ear",
+    "ear (1)",
+    "ear (2)",
+    "ear (a)",
+    "ear (stick)",
+    "cmf buds",
+    "cmf earphone",
+    "nothing phone",
+)
+
+# Lightweight proxy flags: no property caching, no auto-signal wiring.
+# Used for proxies that only need to call methods.
+_FLAGS_METHOD = Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS
+
+
+class BluetoothDevice:
+    def __init__(self, path: str, props: dict):
+        self.path = path
+        self.address: str = str(props.get("Address", ""))
+        self.name: str = str(props.get("Name", props.get("Alias", "Unknown Device")))
+        self.connected: bool = bool(props.get("Connected", False))
+        self.paired: bool = bool(props.get("Paired", False))
+        self.battery: int | None = None
+        self.icon: str = str(props.get("Icon", "audio-headphones"))
+        self.is_nothing: bool = any(p in self.name.lower() for p in NOTHING_PATTERNS)
+
+    def update(self, changed: dict):
+        if "Connected" in changed:
+            self.connected = bool(changed["Connected"])
+        if "Name" in changed:
+            self.name = str(changed["Name"])
+        if "Alias" in changed and not self.name:
+            self.name = str(changed["Alias"])
+
+    def __repr__(self):
+        return f"<BTDevice {self.name!r} {'●' if self.connected else '○'}>"
+
+
+# BlueZ Device1.Icon → GTK symbolic icon name
+_BLUEZ_ICON_MAP: dict[str, str] = {
+    "audio-headphones": "audio-headphones-symbolic",
+    "audio-headset": "audio-headset-symbolic",
+    "audio-card": "audio-card-symbolic",
+    "input-mouse": "input-mouse-symbolic",
+    "input-keyboard": "input-keyboard-symbolic",
+    "input-gaming": "input-gaming-symbolic",
+    "input-tablet": "input-tablet-symbolic",
+    "phone": "phone-symbolic",
+    "computer": "computer-symbolic",
+    "printer": "printer-symbolic",
+}
+
+_WATCH_NAME_PATTERNS = ("watch", "band", "gear", "amazfit", "fenix", "vivoactive", "galaxy fit")
+
+
+def device_icon_name(device: "BluetoothDevice | None") -> str:
+    """Return a GTK symbolic icon name for a Bluetooth device."""
+    if device is None:
+        return "audio-headphones-symbolic"
+    name_lower = device.name.lower()
+    if any(p in name_lower for p in _WATCH_NAME_PATTERNS):
+        return "alarm-symbolic"
+    if "ear (stick)" in name_lower:
+        return "audio-input-microphone-symbolic"
+    mapped = _BLUEZ_ICON_MAP.get(device.icon)
+    if mapped:
+        return mapped
+    if "phone" in name_lower:
+        return "phone-symbolic"
+    return "audio-headphones-symbolic"
+
+
+class BluetoothManager(GObject.Object):
+    __gsignals__ = {
+        "devices-changed": (GObject.SignalFlags.RUN_FIRST, None, ()),
+        "device-connected": (GObject.SignalFlags.RUN_FIRST, None, (str,)),
+        "device-disconnected": (GObject.SignalFlags.RUN_FIRST, None, (str,)),
+    }
+
+    def __init__(self):
+        super().__init__()
+        self.devices: dict[str, BluetoothDevice] = {}
+        self._connection: Gio.DBusConnection | None = None
+        self._adapter_path: str | None = None
+        self._subs: list[int] = []
+        self._available = False
+        self._init_dbus()
+
+    def _init_dbus(self):
+        try:
+            self._connection = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
+            mgr = Gio.DBusProxy.new_sync(
+                self._connection,
+                _FLAGS_METHOD,
+                None,
+                BLUEZ_SERVICE,
+                "/",
+                OBJ_MANAGER_IFACE,
+                None,
+            )
+            # Non-blocking: populates devices and emits devices-changed when ready
+            mgr.call(
+                "GetManagedObjects",
+                None,
+                Gio.DBusCallFlags.NONE,
+                -1,
+                None,
+                self._on_managed_objects,
+                None,
+            )
+            self._subscribe()
+        except Exception as exc:
+            print(f"[bluetooth] D-Bus init failed: {exc}")
+
+    def _on_managed_objects(self, proxy, result, _user_data):
+        try:
+            variant = proxy.call_finish(result)
+            objects = variant.unpack()[0]
+            self._populate(objects)
+            self._available = True
+            GLib.idle_add(self.emit, "devices-changed")
+        except Exception as exc:
+            print(f"[bluetooth] GetManagedObjects failed: {exc}")
+
+    def _populate(self, objects: dict):
+        self.devices = {}
+        self._adapter_path = None
+        for path, ifaces in objects.items():
+            if ADAPTER_IFACE in ifaces and self._adapter_path is None:
+                self._adapter_path = path
+            if DEVICE_IFACE not in ifaces:
+                continue
+            props = dict(ifaces[DEVICE_IFACE])
+            dev = BluetoothDevice(path, props)
+            if BATTERY_IFACE in ifaces:
+                dev.battery = int(ifaces[BATTERY_IFACE].get("Percentage", 0))
+            self.devices[path] = dev
+
+    def _subscribe(self):
+        if not self._connection:
+            return
+        try:
+            self._subs.append(
+                self._connection.signal_subscribe(
+                    BLUEZ_SERVICE,
+                    PROPERTIES_IFACE,
+                    "PropertiesChanged",
+                    None,
+                    None,
+                    Gio.DBusSignalFlags.NONE,
+                    self._on_props_changed,
+                    None,
+                )
+            )
+            self._subs.append(
+                self._connection.signal_subscribe(
+                    BLUEZ_SERVICE,
+                    OBJ_MANAGER_IFACE,
+                    "InterfacesAdded",
+                    None,
+                    None,
+                    Gio.DBusSignalFlags.NONE,
+                    self._on_ifaces_added,
+                    None,
+                )
+            )
+            self._subs.append(
+                self._connection.signal_subscribe(
+                    BLUEZ_SERVICE,
+                    OBJ_MANAGER_IFACE,
+                    "InterfacesRemoved",
+                    None,
+                    None,
+                    Gio.DBusSignalFlags.NONE,
+                    self._on_ifaces_removed,
+                    None,
+                )
+            )
+        except Exception as exc:
+            print(f"[bluetooth] Signal subscribe failed: {exc}")
+
+    def _on_props_changed(self, _conn, _sender, path, _iface, _signal, params, _user_data):
+        iface_name, changed, _invalidated = params.unpack()
+        if iface_name != DEVICE_IFACE:
+            return
+        if path not in self.devices:
+            return
+        dev = self.devices[path]
+        old_connected = dev.connected
+        dev.update(dict(changed))
+        if dev.connected != old_connected:
+            sig = "device-connected" if dev.connected else "device-disconnected"
+            GLib.idle_add(self.emit, sig, path)
+        GLib.idle_add(self.emit, "devices-changed")
+
+    def _on_ifaces_added(self, _conn, _sender, _path, _iface, _signal, params, _user_data):
+        obj_path, ifaces = params.unpack()
+        if ADAPTER_IFACE in ifaces and self._adapter_path is None:
+            self._adapter_path = obj_path
+        if DEVICE_IFACE not in ifaces:
+            return
+        props = dict(ifaces[DEVICE_IFACE])
+        dev = BluetoothDevice(obj_path, props)
+        if BATTERY_IFACE in ifaces:
+            dev.battery = int(ifaces[BATTERY_IFACE].get("Percentage", 0))
+        self.devices[obj_path] = dev
+        GLib.idle_add(self.emit, "devices-changed")
+
+    def _on_ifaces_removed(self, _conn, _sender, _path, _iface, _signal, params, _user_data):
+        obj_path, ifaces = params.unpack()
+        if DEVICE_IFACE in ifaces and obj_path in self.devices:
+            del self.devices[obj_path]
+            GLib.idle_add(self.emit, "devices-changed")
+
+    @property
+    def available(self) -> bool:
+        return self._available
+
+    def get_all(self) -> list[BluetoothDevice]:
+        return sorted(self.devices.values(), key=lambda d: (not d.connected, d.name))
+
+    def get_nothing_devices(self) -> list[BluetoothDevice]:
+        return [d for d in self.get_all() if d.is_nothing]
+
+    def refresh(self):
+        if not self._connection:
+            return
+        try:
+            mgr = Gio.DBusProxy.new_sync(
+                self._connection,
+                _FLAGS_METHOD,
+                None,
+                BLUEZ_SERVICE,
+                "/",
+                OBJ_MANAGER_IFACE,
+                None,
+            )
+            mgr.call(
+                "GetManagedObjects",
+                None,
+                Gio.DBusCallFlags.NONE,
+                -1,
+                None,
+                self._on_managed_objects,
+                None,
+            )
+        except Exception as exc:
+            print(f"[bluetooth] refresh: {exc}")
+
+    def connect_device(self, path: str, on_error=None):
+        if not self._connection:
+            return
+        Gio.DBusProxy.new(
+            self._connection,
+            _FLAGS_METHOD,
+            None,
+            BLUEZ_SERVICE,
+            path,
+            DEVICE_IFACE,
+            None,
+            self._on_connect_proxy_ready,
+            on_error,
+        )
+
+    def _on_connect_proxy_ready(self, _source, result, on_error):
+        try:
+            proxy = Gio.DBusProxy.new_finish(result)
+            proxy.call(
+                "Connect",
+                None,
+                Gio.DBusCallFlags.NONE,
+                -1,
+                None,
+                self._on_connect_done,
+                on_error,
+            )
+        except Exception as exc:
+            print(f"[bluetooth] connect proxy failed: {exc}")
+            if on_error:
+                GLib.idle_add(on_error)
+
+    def _on_connect_done(self, proxy, result, on_error):
+        try:
+            proxy.call_finish(result)
+        except Exception as exc:
+            print(f"[BT] connect error: {exc}")
+            if on_error:
+                GLib.idle_add(on_error)
+
+    def disconnect_device(self, path: str):
+        if not self._connection:
+            return
+        Gio.DBusProxy.new(
+            self._connection,
+            _FLAGS_METHOD,
+            None,
+            BLUEZ_SERVICE,
+            path,
+            DEVICE_IFACE,
+            None,
+            self._on_disconnect_proxy_ready,
+            None,
+        )
+
+    def _on_disconnect_proxy_ready(self, _source, result, _user_data):
+        try:
+            proxy = Gio.DBusProxy.new_finish(result)
+            proxy.call(
+                "Disconnect",
+                None,
+                Gio.DBusCallFlags.NONE,
+                -1,
+                None,
+                self._on_disconnect_done,
+                None,
+            )
+        except Exception as exc:
+            print(f"[bluetooth] disconnect proxy failed: {exc}")
+
+    def _on_disconnect_done(self, proxy, result, _user_data):
+        try:
+            proxy.call_finish(result)
+        except Exception as exc:
+            print(f"[BT] disconnect error: {exc}")
+
+    def start_discovery(self):
+        if not self._connection or not self._adapter_path:
+            return
+        try:
+            proxy = Gio.DBusProxy.new_sync(
+                self._connection,
+                _FLAGS_METHOD,
+                None,
+                BLUEZ_SERVICE,
+                self._adapter_path,
+                ADAPTER_IFACE,
+                None,
+            )
+            proxy.call(
+                "StartDiscovery",
+                None,
+                Gio.DBusCallFlags.NONE,
+                -1,
+                None,
+                self._on_start_discovery_done,
+                None,
+            )
+        except Exception as exc:
+            print(f"[bluetooth] discovery start: {exc}")
+
+    def _on_start_discovery_done(self, proxy, result, _user_data):
+        try:
+            proxy.call_finish(result)
+            GLib.timeout_add_seconds(30, self._stop_discovery)
+        except Exception as exc:
+            print(f"[bluetooth] start discovery error: {exc}")
+
+    def _stop_discovery(self):
+        if not self._connection or not self._adapter_path:
+            return False
+        try:
+            proxy = Gio.DBusProxy.new_sync(
+                self._connection,
+                _FLAGS_METHOD,
+                None,
+                BLUEZ_SERVICE,
+                self._adapter_path,
+                ADAPTER_IFACE,
+                None,
+            )
+            proxy.call_sync("StopDiscovery", None, Gio.DBusCallFlags.NONE, -1, None)
+        except Exception:
+            pass
+        return False

{something_x_dev-1.6.0.dev13 → something_x_dev-1.7.0.dev15}/nothing_app/window.py

@@ -4,6 +4,7 @@ gi.require_version("Gtk", "4.0")
 gi.require_version("Adw", "1")
 from gi.repository import Gtk, Adw
 
+from . import __version__
 from .bluetooth import BluetoothDevice, BluetoothManager
 from .protocol import NothingDevice
 from .pages.home import HomePage
@@ -60,7 +61,10 @@ class SomethingXWindow(Adw.ApplicationWindow):
 
         header = Adw.HeaderBar()
         header.add_css_class("nothing-header")
-        header.set_show_title(True)
+        title_widget = Adw.WindowTitle()
+        title_widget.set_title("Something X")
+        title_widget.set_subtitle(__version__)
+        header.set_title_widget(title_widget)
 
         bt_btn = Gtk.Button.new_from_icon_name("bluetooth-symbolic")
         bt_btn.set_tooltip_text("Bluetooth settings")

{something_x_dev-1.6.0.dev13 → something_x_dev-1.7.0.dev15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "something-x-dev"
-version = "1.6.0.dev13"
+version = "1.7.0.dev15"
 description     = "Something X device manager for Omarchy / Linux"
 readme          = "README.md"
 license         = { text = "MIT" }
@@ -27,7 +27,6 @@ classifiers = [
 
 dependencies = [
     "PyGObject>=3.42",
-    "dbus-python>=1.3",
 ]
 
 [project.scripts]
@@ -41,7 +40,10 @@ include = ["nothing_app*"]
 nothing_app = ["data/*.css", "data/*.desktop"]
 
 [project.optional-dependencies]
-dev = ["ruff"]
+dev = ["ruff", "pytest", "pytest-cov"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
 
 [tool.ruff]
 line-length = 110

{something_x_dev-1.6.0.dev13 → something_x_dev-1.7.0.dev15/something_x_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.6.0.dev13
+Version: 1.7.0.dev15
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT
@@ -16,9 +16,10 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyGObject>=3.42
-Requires-Dist: dbus-python>=1.3
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Dynamic: license-file
 
 <div align="center">
@@ -32,6 +33,8 @@ Built for [Omarchy](https://omarchy.org) · GTK4 · Pure black · JetBrains Mono
 [![AUR](https://img.shields.io/aur/version/something-x?color=red)](https://aur.archlinux.org/packages/something-x)
 [![License: MIT](https://img.shields.io/badge/license-MIT-red.svg)](LICENSE)
 [![Platform](https://img.shields.io/badge/platform-Linux-lightgrey)](https://github.com/SoaOaoS/something-x)
+[![CI](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml/badge.svg)](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml)
+[![Coverage](https://img.shields.io/badge/coverage-tracked-red)](https://github.com/SoaOaoS/something-x/actions/workflows/ci.yml)
 
 </div>
 

{something_x_dev-1.6.0.dev13 → something_x_dev-1.7.0.dev15}/something_x_dev.egg-info/SOURCES.txt

@@ -20,4 +20,8 @@ something_x_dev.egg-info/SOURCES.txt
 something_x_dev.egg-info/dependency_links.txt
 something_x_dev.egg-info/entry_points.txt
 something_x_dev.egg-info/requires.txt
-something_x_dev.egg-info/top_level.txt
+something_x_dev.egg-info/top_level.txt
+tests/test_bluetooth.py
+tests/test_crc.py
+tests/test_profiles.py
+tests/test_protocol.py

{something_x_dev-1.6.0.dev13 → something_x_dev-1.7.0.dev15}/something_x_dev.egg-info/requires.txt

@@ -1,5 +1,6 @@
 PyGObject>=3.42
-dbus-python>=1.3
 
 [dev]
 ruff
+pytest
+pytest-cov