Revert code cleanup

This commit is contained in:
Alok Saboo 2023-12-04 11:37:01 -05:00
parent 316b22e9f9
commit bdc7de874d

View file

@ -188,38 +188,41 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
self._log.error(f"Network error: {e}") self._log.error(f"Network error: {e}")
raise SpotifyAPIError("Network error.") raise SpotifyAPIError("Network error.")
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
status_code = e.response.status_code if e.response else None if e.response.status_code == 401:
error_messages = { self._log.debug(
401: f"{self.data_source} access token has expired. Reauthenticating.", f"{self.data_source} access token has expired. "
404: f"API Error: {status_code}\nURL: {url}\nparams: {params}", f"Reauthenticating."
429: "Too many API requests.", )
502: "Bad Gateway.", self._authenticate()
503: "Service Unavailable.", return self._handle_response(request_type, url, params=params)
} elif e.response.status_code == 404:
raise SpotifyAPIError(
if status_code in error_messages: f"API Error: {e.response.status_code}\n"
self._log.debug(error_messages[status_code]) f"URL: {url}\nparams: {params}"
if status_code == 401: )
self._authenticate() elif e.response.status_code == 429:
return self._handle_response( if retry_count >= max_retries:
request_type, url, params=params raise SpotifyAPIError("Maximum retries reached.")
) seconds = response.headers.get(
elif status_code == 429: "Retry-After", DEFAULT_WAITING_TIME
if retry_count >= max_retries: )
raise SpotifyAPIError("Maximum retries reached.") self._log.debug(
seconds = response.headers.get( f"Too many API requests. Retrying after "
"Retry-After", DEFAULT_WAITING_TIME f"{seconds} seconds."
) )
self._log.debug(f"Retrying after {seconds} seconds.") time.sleep(int(seconds) + 1)
time.sleep(int(seconds) + 1) return self._handle_response(
return self._handle_response( request_type,
request_type, url,
url, params=params,
params=params, retry_count=retry_count + 1,
retry_count=retry_count + 1, )
) elif e.response.status_code == 503:
else: self._log.error("Service Unavailable.")
raise SpotifyAPIError(error_messages[status_code]) raise SpotifyAPIError("Service Unavailable.")
elif e.response.status_code == 502:
self._log.error("Bad Gateway.")
raise SpotifyAPIError("Bad Gateway.")
elif e.response is not None: elif e.response is not None:
raise SpotifyAPIError( raise SpotifyAPIError(
f"{self.data_source} API error:\n{e.response.text}\n" f"{self.data_source} API error:\n{e.response.text}\n"