something-x-dev 1.2.3.dev2__tar.gz → 1.2.3.dev4__tar.gz

{something_x_dev-1.2.3.dev2/something_x_dev.egg-info → something_x_dev-1.2.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.2.3.dev2
+Version: 1.2.3.dev4
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT

{something_x_dev-1.2.3.dev2 → something_x_dev-1.2.3.dev4}/nothing_app/pages/device.py

@@ -265,11 +265,12 @@ def _settings_row(title: str, subtitle: str = "", right_widget: Gtk.Widget | Non
 
 
 class DevicePage(Gtk.Box):
-    def __init__(self, bt_device: BluetoothDevice, bt_manager: BluetoothManager):
+    def __init__(self, bt_device: BluetoothDevice, bt_manager: BluetoothManager, nothing_dev: NothingDevice | None = None):
         super().__init__(orientation=Gtk.Orientation.VERTICAL)
         self._bt_device = bt_device
         self._bt = bt_manager
         self._nothing_dev: NothingDevice | None = None
+        self._nd_handlers: list[int] = []
         self._anc_buttons: list[tuple[int, Gtk.Button]] = []
         self._eq_buttons: list[tuple[str, Gtk.Button]] = []
         self._updating_ui = False
@@ -281,7 +282,7 @@ class DevicePage(Gtk.Box):
         self._connect_retry_id: int | None = None
         self._build()
         if bt_device.is_nothing:
-            self._connect_nothing()
+            self._connect_nothing(nothing_dev)
         if bt_device.connected:
             GLib.timeout_add(800, self._query_volume)
 
@@ -474,17 +475,31 @@ class DevicePage(Gtk.Box):
 
     def cleanup(self):
         if self._nothing_dev:
-            self._nothing_dev.disconnect_rfcomm()
+            for h in self._nd_handlers:
+                try:
+                    self._nothing_dev.disconnect(h)
+                except Exception:
+                    pass
+            self._nd_handlers = []
         self._bt.disconnect(self._bt_conn_handler)
         self._bt.disconnect(self._bt_disc_handler)
 
-    def _connect_nothing(self):
-        self._nothing_dev = NothingDevice(self._bt_device.address)
-        self._nothing_dev.connect("state-changed", self._on_state_changed)
-        self._nothing_dev.connect("connected", self._on_rfcomm_connected)
-        self._nothing_dev.connect("disconnected", self._on_rfcomm_disconnected)
-        if self._bt_device.connected:
-            self._nothing_dev.connect_rfcomm()
+    def _connect_nothing(self, existing: NothingDevice | None):
+        if existing is not None:
+            self._nothing_dev = existing
+        else:
+            self._nothing_dev = NothingDevice(self._bt_device.address)
+            if self._bt_device.connected:
+                self._nothing_dev.connect_rfcomm()
+
+        self._nd_handlers = [
+            self._nothing_dev.connect("state-changed", self._on_state_changed),
+            self._nothing_dev.connect("connected", self._on_rfcomm_connected),
+            self._nothing_dev.connect("disconnected", self._on_rfcomm_disconnected),
+        ]
+        if self._nothing_dev.rfcomm_connected:
+            self._on_state_changed(self._nothing_dev)
+            GLib.timeout_add(800, self._query_volume)
 
     def _on_state_changed(self, dev: NothingDevice):
         state = dev.state
@@ -568,8 +583,6 @@ class DevicePage(Gtk.Box):
 
     def _on_conn_btn_clicked(self, _btn):
         if self._bt_device.connected:
-            if self._nothing_dev:
-                self._nothing_dev.disconnect_rfcomm()
             self._bt.disconnect_device(self._bt_device.path)
         else:
             self._conn_btn.set_label("CONNECTING…")

{something_x_dev-1.2.3.dev2 → something_x_dev-1.2.3.dev4}/nothing_app/window.py

@@ -5,6 +5,7 @@ gi.require_version("Adw", "1")
 from gi.repository import Gtk, Adw
 
 from .bluetooth import BluetoothDevice, BluetoothManager
+from .protocol import NothingDevice
 from .pages.home import HomePage
 from .pages.device import DevicePage
 
@@ -15,7 +16,34 @@ class SomethingXWindow(Adw.ApplicationWindow):
         self.set_default_size(420, 780)
         self.set_resizable(True)
         self._bt = bt_manager
+        self._nothing_devices: dict[str, NothingDevice] = {}
+        self._bt_conn_handler = bt_manager.connect("device-connected", self._on_bt_connected)
+        self._bt_disc_handler = bt_manager.connect("device-disconnected", self._on_bt_disconnected)
         self._build()
+        self._autoconnect_existing()
+
+    def _autoconnect_existing(self):
+        for dev in self._bt.get_nothing_devices():
+            if dev.connected:
+                self._start_nothing_device(dev.path, dev.address)
+
+    def _start_nothing_device(self, path: str, address: str):
+        if path in self._nothing_devices:
+            return
+        nd = NothingDevice(address)
+        self._nothing_devices[path] = nd
+        nd.connect_rfcomm()
+        print(f"[window] autoconnect RFCOMM → {address}")
+
+    def _on_bt_connected(self, _mgr, path: str):
+        dev = self._bt.devices.get(path)
+        if dev and dev.is_nothing:
+            self._start_nothing_device(path, dev.address)
+
+    def _on_bt_disconnected(self, _mgr, path: str):
+        nd = self._nothing_devices.pop(path, None)
+        if nd:
+            nd.disconnect_rfcomm()
 
     def _build(self):
         nav = Adw.NavigationView()
@@ -64,7 +92,8 @@ class SomethingXWindow(Adw.ApplicationWindow):
         header.add_css_class("nothing-header")
         toolbar_view.add_top_bar(header)
 
-        device_page = DevicePage(bt_device=bt_device, bt_manager=self._bt)
+        nothing_dev = self._nothing_devices.get(bt_device.path)
+        device_page = DevicePage(bt_device=bt_device, bt_manager=self._bt, nothing_dev=nothing_dev)
         toolbar_view.set_content(device_page)
 
         nav_page.set_child(toolbar_view)

{something_x_dev-1.2.3.dev2 → something_x_dev-1.2.3.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "something-x-dev"
-version = "1.2.3.dev2"
+version = "1.2.3.dev4"
 description     = "Something X device manager for Omarchy / Linux"
 readme          = "README.md"
 license         = { text = "MIT" }

{something_x_dev-1.2.3.dev2 → something_x_dev-1.2.3.dev4/something_x_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.2.3.dev2
+Version: 1.2.3.dev4
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT