diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5dc4e6b..4e89bfb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,8 +50,8 @@ jobs: - name: Install Commitizen run: | - python -m pip install --upgrade pip - pip install commitizen + python3 -m pip install --upgrade pip + pip3 install commitizen==4.8.3 npm install -g conventional-changelog-cli - name: Configure Git user diff --git a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs index ceca404..08cefc2 100644 --- a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs +++ b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs @@ -228,7 +228,7 @@ pub(in crate::handlers::sonarr_handlers) mod utils { path: "/nfs/tv/series/season 1/episode 1.mkv".to_owned(), size: 3543348019, quality: quality_wrapper(), - languages: vec![language()], + languages: vec![Some(language())], date_added: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()), media_info: Some(media_info()), } diff --git a/src/models/sonarr_models.rs b/src/models/sonarr_models.rs index 1cf983f..1f22ccd 100644 --- a/src/models/sonarr_models.rs +++ b/src/models/sonarr_models.rs @@ -215,7 +215,7 @@ pub struct EpisodeFile { pub path: String, #[serde(deserialize_with = "super::from_i64")] pub size: i64, - pub languages: Vec, + pub languages: Vec>, pub quality: QualityWrapper, pub date_added: DateTime, pub media_info: Option, diff --git a/src/network/sonarr_network/library/episodes/mod.rs b/src/network/sonarr_network/library/episodes/mod.rs index 80c4557..1973c70 100644 --- a/src/network/sonarr_network/library/episodes/mod.rs +++ b/src/network/sonarr_network/library/episodes/mod.rs @@ -297,7 +297,13 @@ impl Network<'_, '_> { Date Added: {}", file.relative_path, file.path, - file.languages.first().unwrap_or(&Language::default()).name, + file + .languages + .first() + .unwrap_or(&Some(Language::default())) + .as_ref() + .unwrap_or(&Language::default()) + .name, file.date_added, ); diff --git a/src/network/sonarr_network/sonarr_network_test_utils.rs b/src/network/sonarr_network/sonarr_network_test_utils.rs index aa57d5b..c03b3c2 100644 --- a/src/network/sonarr_network/sonarr_network_test_utils.rs +++ b/src/network/sonarr_network/sonarr_network_test_utils.rs @@ -180,7 +180,7 @@ pub(in crate::network::sonarr_network) mod test_utils { path: "/nfs/tv/series/season 1/episode 1.mkv".to_owned(), size: 3543348019, quality: quality_wrapper(), - languages: vec![language()], + languages: vec![Some(language())], date_added: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()), media_info: Some(media_info()), }