Merge pull request #2 from Shaffer-Softworks/config-flow

Update README and manifest for Android WS Player integration; enhance…

Author: sickkick

.cursor/rules/android-ws-player.mdc

@@ -9,7 +9,7 @@ Home Assistant **custom integration** (HACS-ready) that exposes Android tablets
 
 - **Repo**: https://github.com/Shaffer-Softworks/Android-WS-Player
 - **Domain**: `android_ws_player`
-- **Version**: `0.2.1` (manifest)
+- **Version**: `0.2.2` (manifest)
 - **Min HA**: `2024.11.0` (`hacs.json`) — required for modern `OptionsFlow`
 
 ## Architecture
@@ -61,5 +61,5 @@ Custom-generated artwork (not copied from Android-Management): Android mascot +
 | Field | Where | Purpose |
 |-------|--------|---------|
 | `name` | entry title | Friendly name |
-| `device_id` | entry data | Tablet listener ID |
+| `device_id` | entry data (editable in options) | Tablet listener / player ID |
 | `event_type` | data/options | Bus event name |

README.md

@@ -9,7 +9,7 @@ Home Assistant custom integration that exposes each Android tablet as a **media
 
 - One media player entity per tablet
 - Configurable `device_id` and event type per device
-- Rename devices from the integration options (gear icon)
+- Edit name, player ID, and event type from the integration options (gear icon)
 - `play_media`, `stop`, and `volume_set` support
 
 ## Installation
@@ -40,7 +40,7 @@ During setup you provide:
 | **Device ID** | Identifier your Android app listens for (e.g. `kitchen_tablet`) |
 | **Event type** | HA event name fired for commands (default: `android_ws_player_command`) |
 
-Use the integration **gear icon** to change the name or event type later.
+Use the integration **gear icon** to change the name, player ID, or event type later.
 
 ## Android app
 

custom_components/android_ws_player/config_flow.py

@@ -48,30 +48,59 @@ def async_get_options_flow(config_entry):
 
 class AndroidWsPlayerOptionsFlow(config_entries.OptionsFlow):
     async def async_step_init(self, user_input=None):
+        errors: dict[str, str] = {}
+
         if user_input is not None:
-            # Update entry title (friendly name shown in UI)
+            device_id = user_input[CONF_DEVICE_ID].strip()
             new_title = user_input["name"].strip()
-            if new_title and new_title != self.config_entry.title:
-                self.hass.config_entries.async_update_entry(self.config_entry, title=new_title)
 
-            # Store other tunables in options
-            return self.async_create_entry(
-                title="",
-                data={
-                    CONF_EVENT_TYPE: user_input.get(CONF_EVENT_TYPE, DEFAULT_EVENT_TYPE).strip(),
-                },
-            )
+            if not device_id:
+                errors["base"] = "invalid_device_id"
+            else:
+                for entry in self.hass.config_entries.async_entries(DOMAIN):
+                    if (
+                        entry.entry_id != self.config_entry.entry_id
+                        and entry.unique_id == device_id
+                    ):
+                        errors[CONF_DEVICE_ID] = "already_configured"
+                        break
+
+            if not errors:
+                data = dict(self.config_entry.data)
+                data[CONF_DEVICE_ID] = device_id
+
+                self.hass.config_entries.async_update_entry(
+                    self.config_entry,
+                    title=new_title or self.config_entry.title,
+                    data=data,
+                    unique_id=device_id,
+                )
+
+                return self.async_create_entry(
+                    title="",
+                    data={
+                        CONF_EVENT_TYPE: user_input.get(
+                            CONF_EVENT_TYPE, DEFAULT_EVENT_TYPE
+                        ).strip(),
+                    },
+                )
 
         schema = vol.Schema(
             {
                 vol.Required("name", default=self.config_entry.title): str,
+                vol.Required(
+                    CONF_DEVICE_ID, default=self.config_entry.data[CONF_DEVICE_ID]
+                ): str,
                 vol.Optional(
                     CONF_EVENT_TYPE,
                     default=self.config_entry.options.get(
-                        CONF_EVENT_TYPE, self.config_entry.data.get(CONF_EVENT_TYPE, DEFAULT_EVENT_TYPE)
+                        CONF_EVENT_TYPE,
+                        self.config_entry.data.get(CONF_EVENT_TYPE, DEFAULT_EVENT_TYPE),
                     ),
                 ): str,
             }
         )
 
-        return self.async_show_form(step_id="init", data_schema=schema)
+        return self.async_show_form(
+            step_id="init", data_schema=schema, errors=errors
+        )

custom_components/android_ws_player/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/Shaffer-Softworks/Android-WS-Player/issues",
   "requirements": [],
-  "version": "0.2.1"
+  "version": "0.2.2"
 }

custom_components/android_ws_player/strings.json

@@ -21,9 +21,14 @@
         "title": "Android WS Player options",
         "data": {
           "name": "Name",
+          "device_id": "Player ID",
           "event_type": "Event type"
         }
       }
+    },
+    "error": {
+      "already_configured": "Another entry already uses this player ID.",
+      "invalid_device_id": "Player ID cannot be empty."
     }
   }
 }

custom_components/android_ws_player/translations/en.json

@@ -21,9 +21,14 @@
         "title": "Android WS Player options",
         "data": {
           "name": "Name",
+          "device_id": "Player ID",
           "event_type": "Event type"
         }
       }
+    },
+    "error": {
+      "already_configured": "Another entry already uses this player ID.",
+      "invalid_device_id": "Player ID cannot be empty."
     }
   }
 }