Updated Ratatui, created custom deserialization logic for i64s to make life easier, and used string interpolation where possible to reduce the lines needed to write log messages or create formatted text

src/models/servarr_data/radarr/modals.rs

@@ -58,7 +58,7 @@ impl From<&RadarrData<'_>> for EditMovieModal {
       .map(|tag_id| {
         radarr_data
           .tags_map
-          .get_by_left(&tag_id.as_u64().unwrap())
+          .get_by_left(&tag_id.as_i64().unwrap())
           .unwrap()
           .clone()
       })
@@ -89,7 +89,7 @@ impl From<&RadarrData<'_>> for EditMovieModal {
       .set_items(quality_profile_names);
     let quality_profile_name = radarr_data
       .quality_profile_map
-      .get_by_left(&quality_profile_id.as_u64().unwrap())
+      .get_by_left(quality_profile_id)
       .unwrap();
     let quality_profile_index = edit_movie_modal
       .quality_profile_list
@@ -193,7 +193,7 @@ impl From<&RadarrData<'_>> for EditCollectionModal {
 
     let quality_profile_name = radarr_data
       .quality_profile_map
-      .get_by_left(&quality_profile_id.as_u64().unwrap())
+      .get_by_left(quality_profile_id)
       .unwrap();
     let quality_profile_index = edit_collection_modal
       .quality_profile_list

src/models/servarr_data/radarr/modals_tests.rs

@@ -27,7 +27,7 @@ mod test {
     let movie = Movie {
       path: "/nfs/movies/Test".to_owned(),
       monitored: true,
-      quality_profile_id: Number::from(2222),
+      quality_profile_id: 2222,
       minimum_availability: MinimumAvailability::Released,
       tags: vec![Number::from(1), Number::from(2)],
       ..Movie::default()
@@ -69,10 +69,10 @@ mod test {
   #[test]
   fn test_add_movie_modal_from_radarr_data() {
     let root_folder = RootFolder {
-      id: Number::from(1),
+      id: 1,
       path: "/nfs".to_owned(),
       accessible: true,
-      free_space: Number::from(219902325555200u64),
+      free_space: 219902325555200,
       unmapped_folders: None,
     };
     let mut radarr_data = RadarrData {
@@ -120,7 +120,7 @@ mod test {
       root_folder_path: Some("/nfs/movies/Test".to_owned()),
       monitored: true,
       search_on_add: true,
-      quality_profile_id: Number::from(2222),
+      quality_profile_id: 2222,
       minimum_availability: MinimumAvailability::Released,
       ..Collection::default()
     };

src/models/servarr_data/radarr/radarr_data.rs

@@ -38,8 +38,8 @@ pub struct RadarrData<'a> {
   pub selected_block: BlockSelectionState<'a, ActiveRadarrBlock>,
   pub downloads: StatefulTable<DownloadRecord>,
   pub indexers: StatefulTable<Indexer>,
-  pub quality_profile_map: BiMap<u64, String>,
-  pub tags_map: BiMap<u64, String>,
+  pub quality_profile_map: BiMap<i64, String>,
+  pub tags_map: BiMap<i64, String>,
   pub collections: StatefulTable<Collection>,
   pub collection_movies: StatefulTable<CollectionMovie>,
   pub logs: StatefulList<HorizontallyScrollableText>,