From bdc7de874dc05a53d7d66b3a47f27adef9793ab8 Mon Sep 17 00:00:00 2001
From: Alok Saboo <arsaboo@gmx.com>
Date: Mon, 4 Dec 2023 11:37:01 -0500
Subject: [PATCH] Revert code cleanup

---
 beetsplug/spotify.py | 69 +++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/beetsplug/spotify.py b/beetsplug/spotify.py
index 03f68a68a..ee536464f 100644
--- a/beetsplug/spotify.py
+++ b/beetsplug/spotify.py
@@ -188,38 +188,41 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
             self._log.error(f"Network error: {e}")
             raise SpotifyAPIError("Network error.")
         except requests.exceptions.RequestException as e:
-            status_code = e.response.status_code if e.response else None
-            error_messages = {
-                401: f"{self.data_source} access token has expired. Reauthenticating.",
-                404: f"API Error: {status_code}\nURL: {url}\nparams: {params}",
-                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:
-                    if retry_count >= max_retries:
-                        raise SpotifyAPIError("Maximum retries reached.")
-                    seconds = response.headers.get(
-                        "Retry-After", DEFAULT_WAITING_TIME
-                    )
-                    self._log.debug(f"Retrying after {seconds} seconds.")
-                    time.sleep(int(seconds) + 1)
-                    return self._handle_response(
-                        request_type,
-                        url,
-                        params=params,
-                        retry_count=retry_count + 1,
-                    )
-                else:
-                    raise SpotifyAPIError(error_messages[status_code])
+            if e.response.status_code == 401:
+                self._log.debug(
+                    f"{self.data_source} access token has expired. "
+                    f"Reauthenticating."
+                )
+                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:
+                    raise SpotifyAPIError("Maximum retries reached.")
+                seconds = response.headers.get(
+                    "Retry-After", DEFAULT_WAITING_TIME
+                )
+                self._log.debug(
+                    f"Too many API requests. Retrying after "
+                    f"{seconds} seconds."
+                )
+                time.sleep(int(seconds) + 1)
+                return self._handle_response(
+                    request_type,
+                    url,
+                    params=params,
+                    retry_count=retry_count + 1,
+                )
+            elif e.response.status_code == 503:
+                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:
                 raise SpotifyAPIError(
                     f"{self.data_source} API error:\n{e.response.text}\n"
@@ -705,4 +708,4 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
             )
         except SpotifyAPIError as e:
             self._log.debug("Spotify API error: {}", e)
-            return None
+            return None
\ No newline at end of file