Merge remote-tracking branch 'origin/main' into test-refactoring

# Conflicts: # Cargo.lock # src/cli/mod.rs # src/cli/radarr/add_command_handler.rs # src/cli/radarr/get_command_handler.rs # src/cli/radarr/list_command_handler.rs
2025-12-15 07:55:14 -07:00
parent 7e53a26e5f 436b3f85d0
commit 35c5eb65cb
19 changed files with 158 additions and 52 deletions
@@ -154,8 +154,19 @@ pub(in crate::handlers::sonarr_handlers) fn history_sorting_options()
          id: 1,
          name: "_".to_owned(),
        };
-        let language_a = &a.languages.first().unwrap_or(&default_language);
-        let language_b = &b.languages.first().unwrap_or(&default_language);
+        let default_language_option = Some(default_language.clone());
+        let language_a = &a
+          .languages
+          .first()
+          .unwrap_or(&default_language_option)
+          .as_ref()
+          .unwrap_or(&default_language);
+        let language_b = &b
+          .languages
+          .first()
+          .unwrap_or(&default_language_option)
+          .as_ref()
+          .unwrap_or(&default_language);

        language_a.cmp(language_b)
      }),