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
This commit is contained in:
2025-12-15 07:55:14 -07:00
19 changed files with 158 additions and 52 deletions
+13 -2
View File
@@ -1,6 +1,7 @@
use crate::app::App;
use crate::models::Route;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EPISODE_DETAILS_BLOCKS};
use crate::models::servarr_models::Language;
use crate::models::sonarr_models::{
DownloadRecord, DownloadStatus, Episode, SonarrHistoryEventType, SonarrHistoryItem, SonarrRelease,
};
@@ -289,7 +290,13 @@ fn draw_episode_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect)
Cell::from(
languages
.iter()
.map(|language| language.name.to_owned())
.map(|language| {
language
.as_ref()
.unwrap_or(&Language::default())
.name
.to_owned()
})
.collect::<Vec<String>>()
.join(","),
),
@@ -450,7 +457,11 @@ fn draw_episode_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
};
let language = if languages.is_some() {
languages.clone().unwrap()[0].name.clone()
languages.clone().unwrap()[0]
.as_ref()
.unwrap_or(&Default::default())
.name
.clone()
} else {
String::new()
};
+12 -2
View File
@@ -280,7 +280,13 @@ fn draw_season_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
Cell::from(
languages
.iter()
.map(|language| language.name.to_owned())
.map(|language| {
language
.as_ref()
.unwrap_or(&Default::default())
.name
.to_owned()
})
.collect::<Vec<String>>()
.join(","),
),
@@ -402,7 +408,11 @@ fn draw_season_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
};
let language = if languages.is_some() {
languages.clone().unwrap()[0].name.clone()
languages.clone().unwrap()[0]
.as_ref()
.unwrap_or(&Default::default())
.name
.clone()
} else {
String::new()
};
@@ -324,7 +324,13 @@ fn draw_series_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
Cell::from(
languages
.iter()
.map(|language| language.name.to_owned())
.map(|language| {
language
.as_ref()
.unwrap_or(&Default::default())
.name
.to_owned()
})
.collect::<Vec<String>>()
.join(","),
),