Merge pull request #263 from fondberg/corr_261

final corr for #261

Makefile

@@ -1,4 +1,4 @@
-__VERSION__ = "3.6.20"
+__VERSION__ = "3.6.21"
 
 bump:
 	bump2version --allow-dirty --current-version $(__VERSION__) patch Makefile custom_components/spotcast/manifest.json

custom_components/spotcast/__init__.py

@@ -44,9 +44,10 @@
 def setup(hass, config):
 
     # get spotify core integration status
+    # if return false, could indicate a bad spotify integration. Race
+    # condition doesn't permit us to abort setup, see #258
     if not helpers.get_spotify_install_status(hass):
-        _LOGGER.error("Spotify integration was not found, please verify integration is functionnal. Could result in python error...")
-        return False
+        _LOGGER.debug("Spotify integration was not found, please verify integration is functionnal. Could result in python error...")
 
     """Setup the Spotcast service."""
     conf = config[DOMAIN]

custom_components/spotcast/manifest.json

@@ -7,7 +7,7 @@
   "requirements": [
     "spotify_token==1.0.0"
   ],
-  "version": "v3.6.20",
+  "version": "v3.6.21",
   "dependencies": [
     "spotify"
   ],

custom_components/spotcast/sensor.py

@@ -89,7 +89,7 @@ def device_state_attributes(self):
     def update(self):
         _LOGGER.debug("Getting playlists")
 
-        playlist_type = "playlists"
+        playlist_type = "user"
         country_code = "SE"
         locale = "en"
         limit = 10

custom_components/spotcast/spotcast_controller.py

@@ -276,17 +276,10 @@ def get_playlists(self, account, playlist_type, country_code, locale, limit):
         resp = {}
 
         if playlist_type == "discover-weekly":
-            resp = client._get(
-                "views/made-for-x",
-                content_limit=limit,
-                locale=locale,
-                platform="web",
-                types="album,playlist,artist,show,station",
-                limit=limit,
-                offset=0,
-            )
-            resp = resp.get("content")
+            playlist_type = "made-for-x"
 
+        if playlist_type == "user" or playlist_type == "default" or playlist_type == "":
+            resp = client.current_user_playlists(limit=limit)
         elif playlist_type == "featured":
             resp = client.featured_playlists(
                 locale=locale,
@@ -297,6 +290,15 @@ def get_playlists(self, account, playlist_type, country_code, locale, limit):
             )
             resp = resp.get("playlists")
         else:
-            resp = client.current_user_playlists(limit=limit)
+            resp = client._get(
+                "views/" + playlist_type,
+                content_limit=limit,
+                locale=locale,
+                platform="web",
+                types="album,playlist,artist,show,station",
+                limit=limit,
+                offset=0,
+            )
+            resp = resp.get("content")
 
         return resp

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.6.20
+current_version = 3.6.21
 
 [flake8]
 exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build