Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-07 00:53:08 +01:00
Code Issues Projects Releases Wiki Activity

Revert code cleanup

Browse source
This commit is contained in:
Alok Saboo 2023-12-04 11:37:01 -05:00
parent 316b22e9f9
commit bdc7de874d
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
beetsplug/spotify.py
View file

@ -188,29 +188,28 @@ 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.",
503: "Service Unavailable.",
}
if status_code in error_messages:
self._log.debug(error_messages[status_code])
if status_code == 401:
self._authenticate()
return self._handle_response(
request_type, url, params=params
) )
elif status_code == 429: self._authenticate()
return self._handle_response(request_type, url, params=params)
elif e.response.status_code == 404:
raise SpotifyAPIError(
f"API Error: {e.response.status_code}\n"
f"URL: {url}\nparams: {params}"
)
elif e.response.status_code == 429:
if retry_count >= max_retries: if retry_count >= max_retries:
raise SpotifyAPIError("Maximum retries reached.") raise SpotifyAPIError("Maximum retries reached.")
seconds = response.headers.get( seconds = response.headers.get(
"Retry-After", DEFAULT_WAITING_TIME "Retry-After", DEFAULT_WAITING_TIME
) )
self._log.debug(f"Retrying after {seconds} seconds.") self._log.debug(
f"Too many API requests. Retrying after "
f"{seconds} seconds."
)
time.sleep(int(seconds) + 1) time.sleep(int(seconds) + 1)
return self._handle_response( return self._handle_response(
request_type, request_type,
@ -218,8 +217,12 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
params=params, params=params,
retry_count=retry_count + 1, retry_count=retry_count + 1,
) )
else: elif e.response.status_code == 503:
raise SpotifyAPIError(error_messages[status_code]) self._log.error("Service Unavailable.")
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"