CLI for SidePulse
Python
Add linked iPhone removal
Peter Kuhara20833c1fdd3
diff --git a/src/sidepulse/links.py b/src/sidepulse/links.pyindex 18f193f..6038919 100644--- a/src/sidepulse/links.py+++ b/src/sidepulse/links.py@@ -145,6 +145,16 @@ def store_ios_link(link: IOSLink, path: Path | None = None) -> tuple[IOSLink, ..return tuple(updated)+def remove_ios_link(token: str, path: Path | None = None) -> IOSLink | None:+ """Remove the phone matching *token* and return the removed link."""+ current = load_ios_links(path)+ removed = next((link for link in current if link.token == token), None)+ if removed is None:+ return None+ save_ios_links((link for link in current if link.token != token), path)+ return removed++def new_pairing_channel() -> str:return secrets.token_urlsafe(8)diff --git a/src/sidepulse/status_bar.py b/src/sidepulse/status_bar.pyindex 6d8510d..4b9046c 100644--- a/src/sidepulse/status_bar.py+++ b/src/sidepulse/status_bar.py@@ -16,6 +16,8 @@ try:NSApp,NSApplication,NSApplicationActivationPolicyAccessory,+ NSAlert,+ NSAlertFirstButtonReturn,NSBackingStoreBuffered,NSBezierPath,NSBezelStyleRounded,@@ -113,7 +115,7 @@ from .led_status import (program_for_agent_mode,write_mode_to_leds,)-from .links import IOSLink, load_ios_links, send_ios_program+from .links import IOSLink, load_ios_links, remove_ios_link, send_ios_programfrom .virtual_device import (FRAME_INTERVAL,VIRTUAL_DEVICE_ID,@@ -1027,6 +1029,10 @@ class StatusBarController(NSObject):def removeRememberedDevice_(self, sender):self.remove_remembered_device(sender.representedObject())+ @objc.IBAction+ def removeLinkedPhone_(self, sender):+ self.remove_linked_phone(sender.representedObject())+@objc.IBActiondef quit_(self, _sender):self.closed_lid_awake.release()@@ -1895,6 +1901,38 @@ class StatusBarController(NSObject):self.refresh_settings_window()self.refresh_(None)+ def remove_linked_phone(self, token: str | None) -> None:+ if not token:+ return+ link = next(+ (entry for entry in self.linked_phone_links() if entry.token == str(token)),+ None,+ )+ if link is None:+ self.set_settings_message("That iPhone is no longer linked.")+ self.refresh_(None)+ return+ if not confirm_linked_phone_removal(link.name):+ return++ device_id = linked_phone_device_id(link)+ try:+ removed = remove_ios_link(link.token)+ if removed is None:+ self.set_settings_message("That iPhone is no longer linked.")+ else:+ self.settings = self.settings.without_device(device_id)+ save_settings(self.settings)+ self.set_settings_message(f"{link.name}: unlinked.")+ except Exception as exc:+ self.set_settings_message(f"Could not remove {link.name}: {exc}")+ self.settings = load_settings()+ return++ self.reset_led_controllers_for_device(device_id)+ self.refresh_settings_window()+ self.refresh_(None)+def open_session(self, status: AgentStatus | object, action: str | None, *, remember: bool) -> None:if not isinstance(status, AgentStatus):return@@ -3407,6 +3445,14 @@ def build_device_menu_item(device: StatusBarDevice, target: StatusBarController)submenu.addItem_(disabled_menu_item("Linked iPhone"))submenu.addItem_(disabled_menu_item(f"ID {device.remote_link.link_id}"))submenu.addItem_(disabled_menu_item(device.remote_link.server))+ remove_phone = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(+ "Remove iPhone...",+ "removeLinkedPhone:",+ "",+ )+ remove_phone.setTarget_(target)+ remove_phone.setRepresentedObject_(device.remote_link.token)+ submenu.addItem_(remove_phone)if device.device_id == VIRTUAL_DEVICE_ID:submenu.addItem_(NSMenuItem.separatorItem())@@ -3535,6 +3581,18 @@ def build_setup_window(target: StatusBarController) -> NSWindow:return window+def confirm_linked_phone_removal(name: str) -> bool:+ alert = NSAlert.alloc().init()+ alert.setMessageText_(f"Remove {name}?")+ alert.setInformativeText_(+ "This Mac will stop sending SidePulse updates to this iPhone. "+ "You can link it again later."+ )+ alert.addButtonWithTitle_("Remove")+ alert.addButtonWithTitle_("Cancel")+ return alert.runModal() == NSAlertFirstButtonReturn++def choose_debug_export_path(format_name: str) -> Path | None:extension = "csv" if format_name == "csv" else "html"panel = NSSavePanel.savePanel()diff --git a/tests/test_links.py b/tests/test_links.pyindex 4969df7..82be1df 100644--- a/tests/test_links.py+++ b/tests/test_links.py@@ -26,6 +26,7 @@ from sidepulse.links import ( # noqa: E402pairing_url,parse_ios_registration,render_terminal_qr,+ remove_ios_link,save_ios_links,send_ios_program,store_ios_link,@@ -60,6 +61,18 @@ class LinkStorageTests(unittest.TestCase):self.assertEqual(len(stored), 1)self.assertEqual(stored[0].name, "New name")+ def test_remove_ios_link_removes_only_matching_phone(self) -> None:+ with tempfile.TemporaryDirectory() as temp_dir:+ path = Path(temp_dir) / "links.json"+ first = IOSLink("Phone A", TOKEN_A)+ second = IOSLink("Phone B", TOKEN_B)+ save_ios_links((first, second), path)++ removed = remove_ios_link(TOKEN_A, path)++ self.assertEqual(removed, first)+ self.assertEqual(load_ios_links(path), (second,))+def test_pairing_channel_is_an_eleven_character_base64url_secret(self) -> None:channels = {new_pairing_channel() for _ in range(100)}self.assertEqual(len(channels), 100)diff --git a/tests/test_status_bar_ui.py b/tests/test_status_bar_ui.pyindex c4e6e68..d2853a7 100644--- a/tests/test_status_bar_ui.py+++ b/tests/test_status_bar_ui.py@@ -23,7 +23,8 @@ import tempfileimport unittestfrom datetime import datetime, timedelta, timezonefrom pathlib import Path-from unittest.mock import patch+from types import SimpleNamespace+from unittest.mock import Mock, patchif os.uname().sysname != "Darwin": # pragma: no coverraise unittest.SkipTest("status-bar UI tests require macOS")@@ -72,6 +73,7 @@ from sidepulse import status_bar as sb # noqa: E402from sidepulse import virtual_device as vd # noqa: E402from sidepulse.collector import MonitorSnapshot, SourceSpec # noqa: E402from sidepulse.models import AgentMode, AgentStatus, AggregateStatus # noqa: E402+from sidepulse.settings import AgentMonitorSettings # noqa: E402# A selector literal: camelCase identifier ending in a single colon.@@ -360,8 +362,45 @@ class MenuBuildTests(StatusBarTestCase):self.assertNotIn("Battery Level", submenu_titles)self.assertIn("Linked iPhone", submenu_titles)self.assertIn("ID aaaaaaaaaaaa", submenu_titles)+ self.assertIn("Remove iPhone...", submenu_titles)self.assertNotIn("Brightness 100%", submenu_titles)+ def test_remove_linked_iphone_requires_confirmation_and_deletes_link(self):+ link = sb.IOSLink("Peter's iPhone", "a" * 64)+ target = SimpleNamespace(+ linked_phone_links=lambda: (link,),+ settings=AgentMonitorSettings(),+ set_settings_message=Mock(),+ reset_led_controllers_for_device=Mock(),+ refresh_settings_window=Mock(),+ refresh_=Mock(),+ )+ with (+ patch("sidepulse.status_bar.confirm_linked_phone_removal", return_value=True),+ patch("sidepulse.status_bar.remove_ios_link", return_value=link) as remove_link,+ patch("sidepulse.status_bar.save_settings"),+ ):+ sb.StatusBarController.remove_linked_phone(target, link.token)++ remove_link.assert_called_once_with(link.token)+ target.reset_led_controllers_for_device.assert_called_once_with(+ sb.linked_phone_device_id(link)+ )+ target.refresh_.assert_called_once_with(None)++ def test_remove_linked_iphone_cancel_keeps_link(self):+ link = sb.IOSLink("Peter's iPhone", "a" * 64)+ target = SimpleNamespace(+ linked_phone_links=lambda: (link,),+ )+ with (+ patch("sidepulse.status_bar.confirm_linked_phone_removal", return_value=False),+ patch("sidepulse.status_bar.remove_ios_link") as remove_link,+ ):+ sb.StatusBarController.remove_linked_phone(target, link.token)++ remove_link.assert_not_called()+def test_recent_statuses_are_capped(self):"""The menu must not grow unbounded with session count."""snapshot = make_snapshot(