Skip to content

Better support multiple spotify instances #28505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
uSpike wants to merge 3 commits into from
Closed

Better support multiple spotify instances #28505

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ba472
Better support multiple spotify instances
uSpike Nov 3, 2019
9dc226c
Use %s format instead of f-strings for loggers
uSpike Nov 6, 2019
ac9987b
Merge branch 'dev' into dev
uSpike Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions homeassistant/components/spotify/media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@
)


def request_configuration(hass, config, add_entities, oauth):
def request_configuration(hass, config, add_entities, oauth, name):
"""Request Spotify authorization."""
client_id = config.get(CONF_CLIENT_ID)
configurator = hass.components.configurator
hass.data[DOMAIN] = configurator.request_config(
DEFAULT_NAME,
hass.data[DOMAIN][client_id] = configurator.request_config(
name,
lambda _: None,
link_name=CONFIGURATOR_LINK_NAME,
link_url=oauth.get_authorize_url(),
Expand All @@ -99,9 +100,14 @@ def request_configuration(hass, config, add_entities, oauth):

def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the Spotify platform."""

hass.data.setdefault(DOMAIN, {})
client_id = config.get(CONF_CLIENT_ID)
name = config.get(CONF_NAME, DEFAULT_NAME)
callback_url = f"{hass.config.api.base_url}{AUTH_CALLBACK_PATH}"
cache = config.get(CONF_CACHE_PATH, hass.config.path(DEFAULT_CACHE_PATH))
if CONF_CACHE_PATH in config:
cache = hass.config.path(config[CONF_CACHE_PATH])
else:
cache = hass.config.path(DEFAULT_CACHE_PATH)
oauth = spotipy.oauth2.SpotifyOAuth(
config.get(CONF_CLIENT_ID),
config.get(CONF_CLIENT_SECRET),
Expand All @@ -111,17 +117,15 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
)
token_info = oauth.get_cached_token()
if not token_info:
_LOGGER.info("no token; requesting authorization")
_LOGGER.info("no token %s; requesting authorization", cache)
hass.http.register_view(SpotifyAuthCallbackView(config, add_entities, oauth))
request_configuration(hass, config, add_entities, oauth)
request_configuration(hass, config, add_entities, oauth, name)
return
if hass.data.get(DOMAIN):
if hass.data[DOMAIN].get(client_id):
configurator = hass.components.configurator
configurator.request_done(hass.data.get(DOMAIN))
del hass.data[DOMAIN]
player = SpotifyMediaPlayer(
oauth, config.get(CONF_NAME, DEFAULT_NAME), config[CONF_ALIASES]
)
configurator.request_done(hass.data[DOMAIN][client_id])
del hass.data[DOMAIN][client_id]
player = SpotifyMediaPlayer(oauth, name, config[CONF_ALIASES])
add_entities([player], True)

def play_playlist_service(service):
Expand Down Expand Up @@ -207,7 +211,7 @@ def update(self):

# Don't true update when token is expired
if self._oauth.is_token_expired(self._token_info):
_LOGGER.warning("Spotify failed to update, token expired.")
_LOGGER.warning("%s failed to update, token expired.", self.name)
return

# Available devices
Expand All @@ -228,7 +232,7 @@ def update(self):
if old_devices.get(name, None) is None
}
if device_diff:
_LOGGER.info("New Devices: %s", str(device_diff))
_LOGGER.info("%s new Devices: %s", self.name, str(device_diff))
# Current playback state
current = self._player.current_playback()
if current is None:
Expand Down Expand Up @@ -298,17 +302,17 @@ def play_media(self, media_type, media_id, **kwargs):
elif media_type == MEDIA_TYPE_PLAYLIST:
kwargs["context_uri"] = media_id
else:
_LOGGER.error("media type %s is not supported", media_type)
_LOGGER.error("%s media type %s is not supported", self.name, media_type)
return
if not media_id.startswith("spotify:"):
_LOGGER.error("media id must be spotify uri")
_LOGGER.error("%s media id must be spotify uri", self.name)
return
self._player.start_playback(**kwargs)

def play_playlist(self, media_id, random_song):
"""Play random music in a playlist."""
if not media_id.startswith("spotify:"):
_LOGGER.error("media id must be spotify playlist uri")
_LOGGER.error("%s media id must be spotify playlist uri", self.name)
return
kwargs = {"context_uri": media_id}
if random_song:
Expand Down