refactor: Refactored several usages of sort_by_key and match guards to utilize newer Rust version APIs

src/network/lidarr_network/blocklist/mod.rs

@@ -82,7 +82,7 @@ impl Network<'_, '_> {
           Route::Lidarr(ActiveLidarrBlock::BlocklistSortPrompt, _)
         ) {
           let mut blocklist_vec: Vec<BlocklistItem> = blocklist_resp.records;
-          blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          blocklist_vec.sort_by_key(|a| a.id);
           app.data.lidarr_data.blocklist.set_items(blocklist_vec);
           app.data.lidarr_data.blocklist.apply_sorting_toggle(false);
         }

src/network/lidarr_network/history/mod.rs

@@ -31,7 +31,7 @@ impl Network<'_, '_> {
           Route::Lidarr(ActiveLidarrBlock::HistorySortPrompt, _)
         ) {
           let mut history_vec = history_response.records;
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           app.data.lidarr_data.history.set_items(history_vec);
           app.data.lidarr_data.history.apply_sorting_toggle(false);
         }

src/network/lidarr_network/library/albums/mod.rs

@@ -33,7 +33,7 @@ impl Network<'_, '_> {
 
     self
       .handle_request::<(), Vec<Album>>(request_props, |mut albums_vec, mut app| {
-        albums_vec.sort_by(|a, b| a.id.cmp(&b.id));
+        albums_vec.sort_by_key(|a| a.id);
         app.data.lidarr_data.albums.set_items(albums_vec);
       })
       .await
@@ -89,7 +89,7 @@ impl Network<'_, '_> {
             .get_or_insert_default();
 
           let mut history_vec = history_items;
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           album_details_modal.album_history.set_items(history_vec);
           album_details_modal
             .album_history

src/network/lidarr_network/library/artists/mod.rs

@@ -64,7 +64,7 @@ impl Network<'_, '_> {
           app.get_current_route(),
           Route::Lidarr(ActiveLidarrBlock::ArtistsSortPrompt, _)
         ) {
-          artists_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          artists_vec.sort_by_key(|a| a.id);
           app.data.lidarr_data.artists.set_items(artists_vec);
           app.data.lidarr_data.artists.apply_sorting_toggle(false);
         }
@@ -309,7 +309,7 @@ impl Network<'_, '_> {
         let artist_history = &mut app.data.lidarr_data.artist_history;
 
         if !is_sorting {
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           artist_history.set_items(history_vec);
           artist_history.apply_sorting_toggle(false);
         }

src/network/lidarr_network/library/tracks/mod.rs

@@ -55,7 +55,7 @@ impl Network<'_, '_> {
 
     self
       .handle_request::<(), Vec<Track>>(request_props, |mut track_vec, mut app| {
-        track_vec.sort_by(|a, b| a.id.cmp(&b.id));
+        track_vec.sort_by_key(|a| a.id);
         let album_details_modal = app
           .data
           .lidarr_data
@@ -238,7 +238,7 @@ impl Network<'_, '_> {
             .into_iter()
             .filter(|it| it.track_id == track_id)
             .collect();
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           track_details_modal.track_history.set_items(history_vec);
           track_details_modal
             .track_history

src/network/lidarr_network/system/mod.rs

@@ -50,7 +50,7 @@ impl Network<'_, '_> {
         let log_lines = logs
           .into_iter()
           .map(|log| {
-            if log.exception.is_some() {
+            if let Some(exception) = log.exception {
               HorizontallyScrollableText::from(format!(
                 "{}|{}|{}|{}|{}",
                 log.time,
@@ -63,10 +63,7 @@ impl Network<'_, '_> {
                   .exception_type
                   .as_ref()
                   .expect("exception_type must exist when exception is present"),
-                log
-                  .exception
-                  .as_ref()
-                  .expect("exception must exist in this branch")
+                exception
               ))
             } else {
               HorizontallyScrollableText::from(format!(

src/network/radarr_network/blocklist/mod.rs

@@ -83,7 +83,7 @@ impl Network<'_, '_> {
           Route::Radarr(ActiveRadarrBlock::BlocklistSortPrompt, _)
         ) {
           let mut blocklist_vec = blocklist_resp.records;
-          blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          blocklist_vec.sort_by_key(|a| a.id);
           app.data.radarr_data.blocklist.set_items(blocklist_vec);
           app.data.radarr_data.blocklist.apply_sorting_toggle(false);
         }

src/network/radarr_network/collections/mod.rs

@@ -128,7 +128,7 @@ impl Network<'_, '_> {
           app.get_current_route(),
           Route::Radarr(ActiveRadarrBlock::CollectionsSortPrompt, _)
         ) {
-          collections_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          collections_vec.sort_by_key(|a| a.id);
           app.data.radarr_data.collections.set_items(collections_vec);
           app.data.radarr_data.collections.apply_sorting_toggle(false);
         }

src/network/radarr_network/history/mod.rs

@@ -31,7 +31,7 @@ impl Network<'_, '_> {
           Route::Radarr(ActiveRadarrBlock::HistorySortPrompt, _)
         ) {
           let mut history_vec = history_response.records;
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           app.data.radarr_data.history.set_items(history_vec);
           app.data.radarr_data.history.apply_sorting_toggle(false);
         }

src/network/radarr_network/library/mod.rs

@@ -270,7 +270,7 @@ impl Network<'_, '_> {
           app.get_current_route(),
           Route::Radarr(ActiveRadarrBlock::MoviesSortPrompt, _)
         ) {
-          movie_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          movie_vec.sort_by_key(|a| a.id);
           app.data.radarr_data.movies.set_items(movie_vec);
           app.data.radarr_data.movies.apply_sorting_toggle(false);
         }

src/network/radarr_network/system/mod.rs

@@ -67,7 +67,7 @@ impl Network<'_, '_> {
         let log_lines = logs
           .into_iter()
           .map(|log| {
-            if log.exception.is_some() {
+            if let Some(exception) = log.exception {
               HorizontallyScrollableText::from(format!(
                 "{}|{}|{}|{}|{}",
                 log.time,
@@ -80,10 +80,7 @@ impl Network<'_, '_> {
                   .exception_type
                   .as_ref()
                   .expect("exception_type must exist when exception is present"),
-                log
-                  .exception
-                  .as_ref()
-                  .expect("exception must exist in this branch")
+                exception
               ))
             } else {
               HorizontallyScrollableText::from(format!(

src/network/sonarr_network/blocklist/mod.rs

@@ -102,7 +102,7 @@ impl Network<'_, '_> {
               }
             })
             .collect();
-          blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          blocklist_vec.sort_by_key(|a| a.id);
           app.data.sonarr_data.blocklist.set_items(blocklist_vec);
           app.data.sonarr_data.blocklist.apply_sorting_toggle(false);
         }

src/network/sonarr_network/history/mod.rs

@@ -31,7 +31,7 @@ impl Network<'_, '_> {
           Route::Sonarr(ActiveSonarrBlock::HistorySortPrompt, _)
         ) {
           let mut history_vec = history_response.records;
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           app.data.sonarr_data.history.set_items(history_vec);
           app.data.sonarr_data.history.apply_sorting_toggle(false);
         }

src/network/sonarr_network/library/episodes/mod.rs

@@ -60,7 +60,7 @@ impl Network<'_, '_> {
 
     self
       .handle_request::<(), Vec<Episode>>(request_props, |mut episode_vec, mut app| {
-        episode_vec.sort_by(|a, b| a.id.cmp(&b.id));
+        episode_vec.sort_by_key(|a| a.id);
         if !matches!(
           app.get_current_route(),
           Route::Sonarr(ActiveSonarrBlock::EpisodesSortPrompt, _)
@@ -151,7 +151,7 @@ impl Network<'_, '_> {
           .get_or_insert_default();
 
         let mut history_vec = history_response.records;
-        history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+        history_vec.sort_by_key(|a| a.id);
         episode_details_modal.episode_history.set_items(history_vec);
         episode_details_modal
           .episode_history

src/network/sonarr_network/library/seasons/mod.rs

@@ -158,7 +158,7 @@ impl Network<'_, '_> {
 
         if !is_sorting {
           let mut history_vec = history_items;
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           season_details_modal.season_history.set_items(history_vec);
           season_details_modal
             .season_history

src/network/sonarr_network/library/series/mod.rs

@@ -315,7 +315,7 @@ impl Network<'_, '_> {
         let series_history = app.data.sonarr_data.series_history.get_or_insert_default();
 
         if !is_sorting {
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          history_vec.sort_by_key(|a| a.id);
           series_history.set_items(history_vec);
           series_history.apply_sorting_toggle(false);
         }
@@ -337,7 +337,7 @@ impl Network<'_, '_> {
           app.get_current_route(),
           Route::Sonarr(ActiveSonarrBlock::SeriesSortPrompt, _)
         ) {
-          series_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          series_vec.sort_by_key(|a| a.id);
           app.data.sonarr_data.series.set_items(series_vec);
           app.data.sonarr_data.series.apply_sorting_toggle(false);
         }

src/network/sonarr_network/system/mod.rs

@@ -50,7 +50,7 @@ impl Network<'_, '_> {
         let log_lines = logs
           .into_iter()
           .map(|log| {
-            if log.exception.is_some() {
+            if let Some(exception) = log.exception {
               HorizontallyScrollableText::from(format!(
                 "{}|{}|{}|{}|{}",
                 log.time,
@@ -63,10 +63,7 @@ impl Network<'_, '_> {
                   .exception_type
                   .as_ref()
                   .expect("exception_type must exist when exception is present"),
-                log
-                  .exception
-                  .as_ref()
-                  .expect("exception must exist in this branch")
+                exception
               ))
             } else {
               HorizontallyScrollableText::from(format!(