Search, view tracks websocket endpoints, service to like media.

custom_components/spotcast/spotify/account.py

@@ -88,7 +88,7 @@ class SpotifyAccount:
         - async_liked_songs
         - async_repeat
         - async_set_volume
-        - async_generic_playlists
+        - async_view
 
     Functions:
         - async_from_config_entry
@@ -917,22 +917,18 @@ async def async_category_playlists(
 
         return playlists
 
-    async def async_generic_playlists(
+    async def async_view(
         self,
         url: str,
         limit: int,
         locale: str,
-        platform: str,
-        types: str,
     ) -> list:
-        """Fetches playlists based on the provided parameters.
+        """Fetches a view based on url.
 
         Args:
-            - url(str): The url of playlist to fetch (e.g., 'views/made-for-x').
+            - url(str): The url of the view to fetch (e.g., 'made-for-x').
             - limit(int): The maximum number of playlists to retrieve.
             - locale(str): The locale for the request (optional).
-            - platform(str): The platform from which the request is made (default is "web").
-            - types(str): The types of content to retrieve (default is 'album,playlist,artist,show,station').
 
         Returns:
             - list: A list of playlists.
@@ -941,8 +937,8 @@ async def async_generic_playlists(
         params = {
             "content_limit": limit,
             "locale": locale,
-            "platform": platform,
-            "types": types,
+            "platform": "album,playlist,artist,show,station",
+            "types": "web",
             "limit": limit,
             "offset": 0,
         }
@@ -952,6 +948,36 @@ async def async_generic_playlists(
         return await self.hass.async_add_executor_job(
             partial(self._internal_cont._get, url, None, **params)
         )
+
+    async def async_search(
+        self,
+        query: str,
+        searchType: int,
+        limit: str,
+    ) -> list:
+        """Fetches either a playlist or songs based.
+
+        Args:
+            - query(str): The query of the list to fetch (e.g., 'Where is the love').
+            - searchType(int): what to retrieve playlists or individual songs.
+            - limit(int): The maximum number of playlists to retrieve.
+
+        Returns:
+            - list: A list of playlists or songs
+        """
+
+        params = {
+            "q": query,
+            "locale": locale,
+            "type": searchType,
+            "limit": limit,
+        }
+
+        await self.async_ensure_tokens_valid()
+
+        return await self.hass.async_add_executor_job(
+            partial(self._internal_cont._get, url, None, **params)
+        )
 
     async def _async_get_count(
             self,

custom_components/spotcast/websocket/__init__.py

@@ -13,7 +13,8 @@
     player_handler,
     cast_devices_handler,
     categories_handler,
-    generic_get_handler,
+    view_handler,
+    search_handler
 )
 
 WEBSOCKET_ENDPOINTS = MappingProxyType({
@@ -41,9 +42,13 @@
         "handler": categories_handler.async_get_categories,
         "schema": categories_handler.SCHEMA,
     },
-    generic_get_handler.ENDPOINT: {
-        "handler": generic_get_handler.async_get_categories,
-        "schema": generic_get_handler.SCHEMA,
+    view_handler.ENDPOINT: {
+        "handler": view_handler.async_get_categories,
+        "schema": view_handler.SCHEMA,
+    },
+    search_handler.ENDPOINT: {
+        "handler": search_handler.async_get_categories,
+        "schema": search_handler.SCHEMA,
     },
 })
 

custom_components/spotcast/websocket/search_handler.py

@@ -0,0 +1,75 @@
+import voluptuous as vol
+from homeassistant.helpers import config_validation as cv
+from homeassistant.core import HomeAssistant
+from homeassistant.components.websocket_api import ActiveConnection
+
+from custom_components.spotcast.utils import get_account_entry, search_account
+from custom_components.spotcast.spotify.account import SpotifyAccount
+from custom_components.spotcast.websocket.utils import websocket_wrapper
+from custom_components.spotcast.spotify.utils import select_image_url
+
+ENDPOINT = "spotcast/search"
+SCHEMA = vol.Schema(
+    {
+        vol.Required("id"): cv.positive_int,
+        vol.Required("type"): ENDPOINT,
+        vol.Required("query"): cv.string,
+        vol.optional("searchType"): cv.string, # Playlist or song, default playlist
+        vol.Optional("limit"): cv.positive_int,
+    }
+)
+
+@websocket_wrapper
+async def search_handler(
+    hass: HomeAssistant, connection: ActiveConnection, msg: dict
+):
+    """Searches for a playlist or song.
+
+    Args:
+        - hass (HomeAssistant): The Home Assistant instance.
+        - connection (ActiveConnection): The active WebSocket connection.
+        - msg (dict): The message received through the WebSocket API.
+    """
+    account_id = msg.get("account")
+    query = msg.get("url")
+    searchType = msg.get("searchType", "playlist")
+    limit = msg.get("limit", 10)
+
+    account: SpotifyAccount
+
+    if account_id is None:
+        entry = get_account_entry(hass)
+        account_id = entry.entry_id
+        account = await SpotifyAccount.async_from_config_entry(hass, entry)
+    else:
+        account = search_account(hass, account_id)
+
+    # prepend view/ to the url
+    url = f"view/{url}"
+
+    result = await account.async_search(
+        query: query,
+        searchType: searchType,
+        limit: limit,
+    )
+
+    formatted_results = [
+        {
+            "id": item["id"],
+            "name": item["name"],
+            "icon": item["images"][0]["url"]
+            if "images" in item and len(item["images"]) > 0
+            else None,
+        }
+        for item in result[searchType]
+        if "id" in item  # Only include playlists with an 'id'
+    ]
+
+    connection.send_result(
+        msg["id"],
+        {
+            "total": len(formatted_results),
+            "account": account_id,
+            "playlists": formatted_results,
+        },
+    )

custom_components/spotcast/websocket/generic_get_handler.py → custom_components/spotcast/websocket/view_handler.py

@@ -8,7 +8,7 @@
 from custom_components.spotcast.websocket.utils import websocket_wrapper
 from custom_components.spotcast.spotify.utils import select_image_url
 
-ENDPOINT = "spotcast/get"
+ENDPOINT = "spotcast/view"
 SCHEMA = vol.Schema(
     {
         vol.Required("id"): cv.positive_int,
@@ -22,9 +22,8 @@
     }
 )
 
-
 @websocket_wrapper
-async def async_get_generic_playlists(
+async def view_handler(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict
 ):
     """Gets a list of playlists from a specified account.
@@ -38,8 +37,6 @@ async def async_get_generic_playlists(
     url = msg.get("url")
     limit = msg.get("limit", 10)
     locale = msg.get("locale", "en_US")
-    platform = msg.get("platform", "web")
-    types = msg.get("types", "album,playlist,artist,show,station")
 
     account: SpotifyAccount
 
@@ -50,11 +47,13 @@ async def async_get_generic_playlists(
     else:
         account = search_account(hass, account_id)
 
-    playlists = await account.async_generic_playlists(
+    # prepend view/ to the url
+    url = f"view/{url}"
+
+    playlists = await account.async_view(
         url=url,
         limit=limit,
         locale=locale,
-        platform=platform,
         types=types,
     )
 
@@ -70,7 +69,6 @@ async def async_get_generic_playlists(
         if "id" in playlist  # Only include playlists with an 'id'
     ]
 
-    # Send the results back to the WebSocket connection
     connection.send_result(
         msg["id"],
         {