From c7f465f968082f447ed6146c6a0c52733dc109a4 Mon Sep 17 00:00:00 2001
From: Alok Saboo <arsaboo@gmx.com>
Date: Tue, 5 Jul 2022 20:46:14 -0400
Subject: [PATCH] Address comments

---
 beetsplug/spotify.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/beetsplug/spotify.py b/beetsplug/spotify.py
index ee86f2714..75ae52891 100644
--- a/beetsplug/spotify.py
+++ b/beetsplug/spotify.py
@@ -193,7 +193,7 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
                     seconds.', seconds)
                 time.sleep(int(seconds) + 1)
                 return self._handle_response(request_type, url, params=params)
-            elif 'analysis not found' in response.text:
+            elif response.status_code == 400:
                 raise SpotifyAPIError("API Error {0.status_code} for {1}"
                                       .format(response, url))
             else:
@@ -650,9 +650,8 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
     def track_audio_features(self, track_id=None):
         """Fetch track audio features by its Spotify ID."""
         try:
-            track_data = self._handle_response(
+            return self._handle_response(
                 requests.get, self.audio_features_url + track_id)
         except SpotifyAPIError as e:
             self._log.debug('Spotify API error: {}', e)
-            track_data = None
-        return track_data
+            return None