From bb143b6b514c29a2a53ab055ebd80d53a322cf94 Mon Sep 17 00:00:00 2001
From: June <61218022+itsjunetime@users.noreply.github.com>
Date: Wed, 23 Oct 2024 22:39:49 -0600
Subject: [PATCH] Deduplicate code and fix a few clippy complaints (#549)

---
 psst-gui/src/ui/mod.rs         |   9 +-
 psst-gui/src/ui/playlist.rs    |  39 +++----
 psst-gui/src/ui/preferences.rs |   2 +-
 psst-gui/src/webapi/client.rs  | 204 ++++++++++-----------------------
 psst-gui/src/webapi/local.rs   |   2 +-
 psst-gui/src/widget/link.rs    |   3 +-
 6 files changed, 82 insertions(+), 177 deletions(-)

diff --git a/psst-gui/src/ui/mod.rs b/psst-gui/src/ui/mod.rs
index fcf9612d..2efc9e8f 100644
--- a/psst-gui/src/ui/mod.rs
+++ b/psst-gui/src/ui/mod.rs
@@ -474,17 +474,12 @@ fn route_icon_widget() -> impl Widget<Nav> {
         |nav: &Nav, _, _| {
             let icon = |icon: &SvgIcon| icon.scale(theme::ICON_SIZE_MEDIUM);
             match &nav {
-                Nav::Home => Empty.boxed(),
-                Nav::Lyrics => Empty.boxed(),
-                Nav::SavedTracks => Empty.boxed(),
-                Nav::SavedAlbums => Empty.boxed(),
-                Nav::SavedShows => Empty.boxed(),
-                Nav::SearchResults(_) => icon(&icons::SEARCH).boxed(),
+                Nav::Home | Nav::Lyrics | Nav::SavedTracks | Nav::SavedAlbums | Nav::SavedShows => Empty.boxed(),
+                Nav::SearchResults(_) | Nav::Recommendations(_) => icon(&icons::SEARCH).boxed(),
                 Nav::AlbumDetail(_) => icon(&icons::ALBUM).boxed(),
                 Nav::ArtistDetail(_) => icon(&icons::ARTIST).boxed(),
                 Nav::PlaylistDetail(_) => icon(&icons::PLAYLIST).boxed(),
                 Nav::ShowDetail(_) => icon(&icons::PODCAST).boxed(),
-                Nav::Recommendations(_) => icon(&icons::SEARCH).boxed(),
             }
         },
     )
diff --git a/psst-gui/src/ui/playlist.rs b/psst-gui/src/ui/playlist.rs
index 31ee3639..ae92b584 100644
--- a/psst-gui/src/ui/playlist.rs
+++ b/psst-gui/src/ui/playlist.rs
@@ -437,12 +437,12 @@ pub fn detail_widget() -> impl Widget<AppState> {
         },
         |_, data, d| data.playlist_detail.tracks.defer(d.0),
         |_, data, (d, r)| {
-            let r = r.map(|tracks| PlaylistTracks {
+            let tracks = PlaylistTracks {
                 id: d.0.id.clone(),
                 name: d.0.name.clone(),
-                tracks,
-            });
-            data.playlist_detail.tracks.update((d.0, r))
+                tracks: r,
+            };
+            data.playlist_detail.tracks.update((d.0, Ok(tracks)))
         },
     )
 }
@@ -450,44 +450,41 @@ pub fn detail_widget() -> impl Widget<AppState> {
 fn sort_playlist(
     data: &AppState,
     result: Result<Vector<Arc<Track>>, Error>,
-) -> Result<Vector<Arc<Track>>, Error> {
+) -> Vector<Arc<Track>> {
     let sort_criteria = data.config.sort_criteria;
     let sort_order = data.config.sort_order;
 
     let playlist = result.unwrap_or_else(|_| Vector::new());
 
-    let mut sorted_playlist: Vector<Arc<Track>> = playlist
+    let sorted_playlist: Vector<Arc<Track>> = playlist
         .into_iter()
         .sorted_by(|a, b| {
-            let mut method = match sort_criteria {
+            let method = match sort_criteria {
                 SortCriteria::Title => a.name.cmp(&b.name),
                 SortCriteria::Artist => a.artist_name().cmp(&b.artist_name()),
                 SortCriteria::Album => a.album_name().cmp(&b.album_name()),
                 SortCriteria::Duration => a.duration.cmp(&b.duration),
-                _ => Ordering::Equal,
+                SortCriteria::DateAdded => Ordering::Equal,
             };
-            method = if sort_order == SortOrder::Descending {
+
+            if sort_order == SortOrder::Descending {
                 method.reverse()
             } else {
                 method
-            };
-            method
+            }
         })
         .collect();
 
-    sorted_playlist =
-        if sort_criteria == SortCriteria::DateAdded && sort_order == SortOrder::Descending {
-            sorted_playlist.into_iter().rev().collect()
-        } else {
-            sorted_playlist
-        };
-
-    Ok(sorted_playlist)
+    if sort_criteria == SortCriteria::DateAdded && sort_order == SortOrder::Descending {
+        sorted_playlist.into_iter().rev().collect()
+    } else {
+        sorted_playlist
+    }
 }
 
 fn playlist_menu_ctx(playlist: &WithCtx<Playlist>) -> Menu<AppState> {
-    let library = &playlist.ctx.to_owned().library;
-    let playlist = &playlist.to_owned().data;
+    let library = &playlist.ctx.library;
+    let playlist = &playlist.data;
 
     let mut menu = Menu::empty();
 
diff --git a/psst-gui/src/ui/preferences.rs b/psst-gui/src/ui/preferences.rs
index b6b103d7..fd75b0b5 100644
--- a/psst-gui/src/ui/preferences.rs
+++ b/psst-gui/src/ui/preferences.rs
@@ -88,7 +88,7 @@ pub fn preferences_widget() -> impl Widget<AppState> {
                 ctx.submit_command(PROPAGATE_FLAGS);
             }
         })
-        .on_command(PROPAGATE_FLAGS, |_, _, data| {
+        .on_command(PROPAGATE_FLAGS, |_, (), data| {
             data.common_ctx_mut().show_track_cover = data.config.show_track_cover;
         })
         .scroll()
diff --git a/psst-gui/src/webapi/client.rs b/psst-gui/src/webapi/client.rs
index ae141038..679139ba 100644
--- a/psst-gui/src/webapi/client.rs
+++ b/psst-gui/src/webapi/client.rs
@@ -66,11 +66,10 @@ impl WebApi {
     }
 
     fn access_token(&self) -> Result<String, Error> {
-        let token = self
-            .token_provider
+        self.token_provider
             .get(&self.session)
-            .map_err(|err| Error::WebApiError(err.to_string()))?;
-        Ok(token.token)
+            .map_err(|err| Error::WebApiError(err.to_string()))
+            .map(|t| t.token)
     }
 
     fn build_request(
@@ -82,8 +81,8 @@ impl WebApi {
         let token = self.access_token()?;
         let request = self
             .agent
-            .request(method, &format!("https://{}/{}", base_url, path))
-            .set("Authorization", &format!("Bearer {}", &token));
+            .request(method, &format!("https://{base_url}/{path}"))
+            .set("Authorization", &format!("Bearer {token}"));
         Ok(request)
     }
 
@@ -128,16 +127,15 @@ impl WebApi {
     /// Send a request with a empty JSON object, throw away the response body.
     /// Use for POST/PUT/DELETE requests.
     fn send_empty_json(&self, request: Request) -> Result<(), Error> {
-        let _response = Self::with_retry(|| Ok(request.clone().send_string("{}")?))?;
-        Ok(())
+        Self::with_retry(|| Ok(request.clone().send_string("{}")?))
+            .map(|_| ())
     }
 
     /// Send a request and return the deserialized JSON body.  Use for GET
     /// requests.
     fn load<T: DeserializeOwned>(&self, request: Request) -> Result<T, Error> {
         let response = Self::with_retry(|| Ok(request.clone().call()?))?;
-        let result = response.into_json()?;
-        Ok(result)
+        Ok(response.into_json()?)
     }
 
     /// Send a request using `self.load()`, but only if it isn't already present
@@ -193,10 +191,9 @@ impl WebApi {
                 limit = page_limit;
                 offset = page_offset + page_limit;
             } else {
-                break;
+                break Ok(());
             }
         }
-        Ok(())
     }
 
     /// Very similar to `for_all_pages`, but only returns a certain number of results
@@ -515,13 +512,13 @@ impl WebApi {
                                 ),
                                 owner: PublicUser {
                                     id: Arc::from(""),
-                                    display_name: item
+                                    display_name: Arc::from(item
                                         .content
                                         .data
                                         .owner_v2
                                         .as_ref()
-                                        .map(|owner| Arc::from(owner.data.name.as_str()))
-                                        .unwrap_or_else(|| Arc::from("")),
+                                        .map(|owner| owner.data.name.as_str())
+                                        .unwrap_or_default())
                                 },
                                 collaborative: false,
                             });
@@ -817,15 +814,6 @@ impl WebApi {
             world_rank: i64,
         }
 
-        let extensions = json!({
-            "persistedQuery": {
-                "version": 1,
-                // From https://github.com/spicetify/cli/blob/bb767a9059143fe183c1c577acff335dc6a462b7/Extensions/shuffle%2B.js#L373 keep and eye on this and change accordingly
-                "sha256Hash": "35648a112beb1794e39ab931365f6ae4a8d45e65396d641eeda94e4003d41497"
-            }
-        });
-        let extensions_json = serde_json::to_string(&extensions);
-
         let variables = json!( {
             "uri": format!("spotify:artist:{}", id),
             "locale": "",
@@ -837,7 +825,7 @@ impl WebApi {
             .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
             .query("operationName", "queryArtistOverview")
             .query("variables", &variables_json.unwrap().to_string())
-            .query("extensions", &extensions_json.unwrap().to_string());
+            .query("extensions", EXTENSIONS_JSON);
 
         let result: Cached<Welcome> = self.load_cached(request, "artist-info", id)?;
 
@@ -940,10 +928,9 @@ impl WebApi {
     // https://developer.spotify.com/documentation/web-api/reference/get-track
     pub fn get_track(&self, id: &str) -> Result<Arc<Track>, Error> {
         let request = self
-            .get(format!("v1/tracks/{}", id), None)?
+            .get(format!("v1/tracks/{id}"), None)?
             .query("market", "from_token");
-        let result = self.load(request)?;
-        Ok(result)
+        self.load(request)
     }
 
     pub fn get_lyrics(&self, track_id: String) -> Result<Vector<TrackLines>, Error> {
@@ -964,12 +951,12 @@ impl WebApi {
         let token = self.access_token()?;
         let request = self
             .agent
-            .request("GET", &format!("https://spclient.wg.spotify.com/color-lyrics/v2/track/{}/image/https%3A%2F%2Fi.scdn.co%2Fimage%2F{}", track_id, track_id.clone().split_off(3)))
+            .request("GET", &format!("https://spclient.wg.spotify.com/color-lyrics/v2/track/{track_id}/image/https%3A%2F%2Fi.scdn.co%2Fimage%2F{}", track_id.clone().split_off(3)))
             .query("format", "json")
             .query("vocalRemoval", "false")
             .query("market", "from_token")
             .set("app-platform", "WebPlayer")
-            .set("Authorization", &format!("Bearer {}", &token));
+            .set("Authorization", &format!("Bearer {token}"));
 
         let lyrics: Cached<Root> = self.load_cached(request.clone(), "TrackLines", &track_id)?;
         Ok(lyrics.data.lyrics.lines)
@@ -999,15 +986,13 @@ impl WebApi {
     // https://developer.spotify.com/documentation/web-api/reference/save-albums-user/
     pub fn save_album(&self, id: &str) -> Result<(), Error> {
         let request = self.put("v1/me/albums", None)?.query("ids", id);
-        self.send_empty_json(request)?;
-        Ok(())
+        self.send_empty_json(request)
     }
 
     // https://developer.spotify.com/documentation/web-api/reference/remove-albums-user/
     pub fn unsave_album(&self, id: &str) -> Result<(), Error> {
         let request = self.delete("v1/me/albums", None)?.query("ids", id);
-        self.send_empty_json(request)?;
-        Ok(())
+        self.send_empty_json(request)
     }
 
     // https://developer.spotify.com/documentation/web-api/reference/get-users-saved-tracks/
@@ -1047,32 +1032,36 @@ impl WebApi {
     // https://developer.spotify.com/documentation/web-api/reference/save-tracks-user/
     pub fn save_track(&self, id: &str) -> Result<(), Error> {
         let request = self.put("v1/me/tracks", None)?.query("ids", id);
-        self.send_empty_json(request)?;
-        Ok(())
+        self.send_empty_json(request)
     }
 
     // https://developer.spotify.com/documentation/web-api/reference/remove-tracks-user/
     pub fn unsave_track(&self, id: &str) -> Result<(), Error> {
         let request = self.delete("v1/me/tracks", None)?.query("ids", id);
-        self.send_empty_json(request)?;
-        Ok(())
+        self.send_empty_json(request)
     }
 
     // https://developer.spotify.com/documentation/web-api/reference/save-shows-user
     pub fn save_show(&self, id: &str) -> Result<(), Error> {
         let request = self.put("v1/me/shows", None)?.query("ids", id);
-        self.send_empty_json(request)?;
-        Ok(())
+        self.send_empty_json(request)
     }
 
     // https://developer.spotify.com/documentation/web-api/reference/remove-shows-user
     pub fn unsave_show(&self, id: &str) -> Result<(), Error> {
         let request = self.delete("v1/me/shows", None)?.query("ids", id);
-        self.send_empty_json(request)?;
-        Ok(())
+        self.send_empty_json(request)
     }
 }
 
+// From https://github.com/KRTirtho/spotube/blob/9b024120601c0d381edeab4460cb22f87149d0f8/lib%2Fservices%2Fcustom_spotify_endpoints%2Fspotify_endpoints.dart keep and eye on this and change accordingly
+const EXTENSIONS_JSON: &str = r#"{
+    "persistedQuery": {
+        "version": 1,
+        "sha256Hash": "eb3fba2d388cf4fc4d696b1757a58584e9538a3b515ea742e9cc9465807340be"
+    }
+}"#;
+
 /// View endpoints.
 impl WebApi {
     pub fn get_user_info(&self) -> Result<(String, String), Error> {
@@ -1086,156 +1075,81 @@ impl WebApi {
             .agent
             .request("GET", &format!("http://{}/{}", "ip-api.com", "json"))
             .query("fields", "260")
-            .set("Authorization", &format!("Bearer {}", &token));
+            .set("Authorization", &format!("Bearer {token}"));
 
         let result: Cached<User> = self.load_cached(request, "User_info", "usrinfo")?;
 
-        Ok((result.data.region.clone(), result.data.timezone.clone()))
+        Ok((result.data.region, result.data.timezone))
     }
 
-    fn build_home_request(&self, section_uri: &str) -> (String, String) {
-        let extensions = json!({
-            "persistedQuery": {
-                "version": 1,
-                // From https://github.com/KRTirtho/spotube/blob/9b024120601c0d381edeab4460cb22f87149d0f8/lib%2Fservices%2Fcustom_spotify_endpoints%2Fspotify_endpoints.dart keep and eye on this and change accordingly
-                "sha256Hash": "eb3fba2d388cf4fc4d696b1757a58584e9538a3b515ea742e9cc9465807340be"
-            }
-        });
+    fn build_home_request(&self, section_uri: &str) -> Result<String, Error> {
+        let (time_zone, country) = self.get_user_info()?;
+        let access_token = self.access_token()?;
 
         let variables = json!( {
             "uri": section_uri,
-            "timeZone": self.get_user_info().unwrap().0,
-            "sp_t": self.access_token().unwrap(),  // Assuming this returns a Result<String, Error>
-            "country": self.get_user_info().unwrap().1,
+            "timeZone": time_zone,
+            "sp_t": access_token,
+            "country": country,
             "sectionItemsOffset": 0,
             "sectionItemsLimit": 20,
         });
 
-        let variables_json = serde_json::to_string(&variables);
-        let extensions_json = serde_json::to_string(&extensions);
-
-        (variables_json.unwrap(), extensions_json.unwrap())
+        serde_json::to_string(&variables)
+            .map_err(|e| Error::WebApiError(format!("Couldn't serialize variables: {e}")))
     }
 
-    pub fn get_made_for_you(&self) -> Result<MixedView, Error> {
-        // 0JQ5DAUnp4wcj0bCb3wh3S -> Daily mixes
-        let json_query = self.build_home_request("spotify:section:0JQ5DAUnp4wcj0bCb3wh3S");
+    pub fn get_section(&self, section_uri: &str) -> Result<MixedView, Error> {
         let request = self
             .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
             .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
+            .query("variables", &self.build_home_request(section_uri)?)
+            .query("extensions", EXTENSIONS_JSON);
 
         // Extract the playlists
-        let result = self.load_and_return_home_section(request)?;
+        self.load_and_return_home_section(request)
+    }
 
-        Ok(result)
+    pub fn get_made_for_you(&self) -> Result<MixedView, Error> {
+        // 0JQ5DAUnp4wcj0bCb3wh3S -> Daily mixes
+        self.get_section("spotify:section:0JQ5DAUnp4wcj0bCb3wh3S")
     }
 
     pub fn get_top_mixes(&self) -> Result<MixedView, Error> {
         // 0JQ5DAnM3wGh0gz1MXnu89 -> Top mixes
-        let json_query = self.build_home_request("spotify:section:0JQ5DAnM3wGh0gz1MXnu89");
-        let request = self
-            .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
-            .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
-
-        // Extract the playlists
-        let result = self.load_and_return_home_section(request)?;
-
-        Ok(result)
+        self.get_section("spotify:section:0JQ5DAnM3wGh0gz1MXnu89")
     }
 
     pub fn recommended_stations(&self) -> Result<MixedView, Error> {
         // 0JQ5DAnM3wGh0gz1MXnu3R -> Recommended stations
-        let json_query = self.build_home_request("spotify:section:0JQ5DAnM3wGh0gz1MXnu3R");
-
-        let request = self
-            .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
-            .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
-
-        // Extract the playlists
-        let result = self.load_and_return_home_section(request)?;
-
-        Ok(result)
+        self.get_section("spotify:section:0JQ5DAnM3wGh0gz1MXnu3R")
     }
 
     pub fn uniquely_yours(&self) -> Result<MixedView, Error> {
         // 0JQ5DAqAJXkJGsa2DyEjKi -> Uniquely yours
-        let json_query = self.build_home_request("spotify:section:0JQ5DAqAJXkJGsa2DyEjKi");
-
-        let request = self
-            .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
-            .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
-
-        // Extract the playlists
-        let result = self.load_and_return_home_section(request)?;
-
-        Ok(result)
+        self.get_section("spotify:section:0JQ5DAqAJXkJGsa2DyEjKi")
     }
 
     pub fn best_of_artists(&self) -> Result<MixedView, Error> {
         // 0JQ5DAnM3wGh0gz1MXnu3n -> Best of artists
-        let json_query = self.build_home_request("spotify:section:0JQ5DAnM3wGh0gz1MXnu3n");
-        let request = self
-            .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
-            .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
-
-        let result = self.load_and_return_home_section(request)?;
-
-        Ok(result)
+        self.get_section("spotify:section:0JQ5DAnM3wGh0gz1MXnu3n")
     }
 
     // Need to make a mix of it!
     pub fn jump_back_in(&self) -> Result<MixedView, Error> {
         // 0JQ5DAIiKWzVFULQfUm85X -> Jump back in
-        let json_query = self.build_home_request("spotify:section:0JQ5DAIiKWzVFULQfUm85X");
-        let request = self
-            .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
-            .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
-
-        // Extract the playlists
-        let result = self.load_and_return_home_section(request)?;
-
-        Ok(result)
+        self.get_section("spotify:section:0JQ5DAIiKWzVFULQfUm85X")
     }
 
     // Shows
     pub fn your_shows(&self) -> Result<MixedView, Error> {
         // 0JQ5DAnM3wGh0gz1MXnu3N -> Your shows
-        let json_query = self.build_home_request("spotify:section:0JQ5DAnM3wGh0gz1MXnu3N");
-        let request = self
-            .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
-            .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
-
-        let result = self.load_and_return_home_section(request)?;
-
-        Ok(result)
+        self.get_section("spotify:section:0JQ5DAnM3wGh0gz1MXnu3N")
     }
 
     pub fn shows_that_you_might_like(&self) -> Result<MixedView, Error> {
         // 0JQ5DAnM3wGh0gz1MXnu3P -> Shows that you might like
-        let json_query = self.build_home_request("spotify:section:0JQ5DAnM3wGh0gz1MXnu3P");
-        let request = self
-            .get("pathfinder/v1/query", Some("api-partner.spotify.com"))?
-            .query("operationName", "homeSection")
-            .query("variables", &json_query.0.to_string())
-            .query("extensions", &json_query.1.to_string());
-
-        let result = self.load_and_return_home_section(request)?;
-
-        Ok(result)
+        self.get_section("spotify:section:0JQ5DAnM3wGh0gz1MXnu3P")
     }
 
     /*
@@ -1445,13 +1359,13 @@ impl WebApi {
 
         fn add_range_param(mut req: Request, r: Range<impl ToString>, s: &str) -> Request {
             if let Some(v) = r.min {
-                req = req.query(&format!("min_{}", s), &v.to_string());
+                req = req.query(&format!("min_{s}"), &v.to_string());
             }
             if let Some(v) = r.max {
-                req = req.query(&format!("max_{}", s), &v.to_string());
+                req = req.query(&format!("max_{s}"), &v.to_string());
             }
             if let Some(v) = r.target {
-                req = req.query(&format!("target_{}", s), &v.to_string());
+                req = req.query(&format!("target_{s}"), &v.to_string());
             }
             req
         }
diff --git a/psst-gui/src/webapi/local.rs b/psst-gui/src/webapi/local.rs
index 6dcd711a..1dc00df4 100644
--- a/psst-gui/src/webapi/local.rs
+++ b/psst-gui/src/webapi/local.rs
@@ -16,7 +16,7 @@ use serde_json::Value;
 use crate::data::{config::Config, AlbumLink, ArtistLink, Image, Track, TrackId};
 use psst_core::item_id::ItemId;
 
-/**
+/*
  * All local files registered by the Spotify file can be found in the file
  * located at: <Spotify config>/Users/<username>-user/local-files.bnk
  *
diff --git a/psst-gui/src/widget/link.rs b/psst-gui/src/widget/link.rs
index 68678d27..63f34ca7 100644
--- a/psst-gui/src/widget/link.rs
+++ b/psst-gui/src/widget/link.rs
@@ -75,8 +75,7 @@ impl<T: Data> Widget<T> for Link<T> {
             let is_active = self
                 .is_active
                 .as_ref()
-                .map(|predicate| predicate(data, env))
-                .unwrap_or(false);
+                .map_or(false, |predicate| predicate(data, env));
             if is_active {
                 env.get(theme::LINK_ACTIVE_COLOR)
             } else {