Merge pull request #16 from natekspencer/dev

Handle invalid index bug in play random track button

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

README.md

@@ -1,6 +1,9 @@
-![Release](https://img.shields.io/github/v/release/natekspencer/hacs-oasis_mini?style=for-the-badge)
+[![Release](https://img.shields.io/github/v/release/natekspencer/hacs-oasis_mini?style=for-the-badge)](https://github.com/natekspencer/hacs-oasis_mini/releases)
 [![Buy Me A Coffee/Beer](https://img.shields.io/badge/Buy_Me_A_☕/🍺-F16061?style=for-the-badge&logo=ko-fi&logoColor=white&labelColor=grey)](https://ko-fi.com/natekspencer)
-[![hacs_badge](https://img.shields.io/badge/HACS-Custom-41BDF5.svg?style=for-the-badge)](https://github.com/hacs/integration)
+[![HACS Custom](https://img.shields.io/badge/HACS-Custom-41BDF5.svg?style=for-the-badge)](https://github.com/hacs/integration)
+
+![Downloads](https://img.shields.io/github/downloads/natekspencer/hacs-oasis_mini/total?style=flat-square)
+![Latest Downloads](https://img.shields.io/github/downloads/natekspencer/hacs-oasis_mini/latest/total?style=flat-square)
 
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="https://brands.home-assistant.io/oasis_mini/dark_logo.png">

custom_components/oasis_mini/helpers.py

@@ -21,7 +21,7 @@ async def add_and_play_track(device: OasisMini, track: int) -> None:
 
     # Move track to next item in the playlist and then select it
     if (index := device.playlist.index(track)) != device.playlist_index:
-        if index != (_next := min(device.playlist_index + 1, len(device.playlist))):
+        if index != (_next := min(device.playlist_index + 1, len(device.playlist) - 1)):
             await device.async_move_track(index, _next)
         await device.async_change_track(_next)
 

custom_components/oasis_mini/pyoasismini/__init__.py

@@ -6,7 +6,6 @@ from typing import Any, Awaitable, Callable, Final
 from urllib.parse import urljoin
 
 from aiohttp import ClientResponseError, ClientSession
-import async_timeout
 
 from .utils import _bit_to_bool
 
@@ -177,10 +176,14 @@ class OasisMini:
 
     async def async_add_track_to_playlist(self, track: int) -> None:
         """Add track to playlist."""
-        if track and 0 in self.playlist:
+        if not track:
+            return
+
+        if 0 in self.playlist:
             playlist = [t for t in self.playlist if t] + [track]
-            await self.async_set_playlist(playlist)
-        else:
+            return await self.async_set_playlist(playlist)
+
+        _LOGGER.debug("Adding track %s to playlist", track)
         await self._async_command(params={"ADDJOBLIST": track})
         self.playlist.append(track)
 
@@ -192,7 +195,7 @@ class OasisMini:
 
     async def async_clear_playlist(self) -> None:
         """Clear the playlist."""
-        await self.async_set_playlist([0])
+        await self.async_set_playlist([])
 
     async def async_get_ip_address(self) -> str | None:
         """Get the ip address."""
@@ -400,9 +403,6 @@ class OasisMini:
 
     async def _async_command(self, **kwargs: Any) -> str | None:
         """Send a command to the device."""
-        with async_timeout.timeout(5):
-            while self.busy:
-                await asyncio.sleep(0.1)
         result = await self._async_get(**kwargs)
         _LOGGER.debug("Result: %s", result)
 

custom_components/oasis_mini/strings.json

@@ -26,7 +26,7 @@
   "options": {
     "step": {
       "init": {
-        "description": "Add your cloud credentials to get additional information about your Oasis Mini",
+        "description": "Add your cloud credentials to get additional information about your device",
         "data": {
           "email": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]"

custom_components/oasis_mini/translations/en.json

@@ -26,7 +26,7 @@
   "options": {
     "step": {
       "init": {
-        "description": "Add your cloud credentials to get additional information about your Oasis Mini",
+        "description": "Add your cloud credentials to get additional information about your device",
         "data": {
           "email": "Email",
           "password": "Password"