NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix interactive season choosing activation on url filter excluded seasons

Browse source
This commit is contained in:
ByteDream 2023-01-08 18:06:37 +01:00
parent b65c0e9dfd
commit 13f54c0da6
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crunchy-cli-core/src/cli/archive.rs
View file

@ -379,7 +379,10 @@ async fn formats_from_series(
.locale .locale
.iter() .iter()
.any(|l| s.metadata.audio_locales.contains(l)) .any(|l| s.metadata.audio_locales.contains(l))
}) });
// remove seasons which match the url filter. this is mostly done to not trigger the
// interactive season choosing when dupilcated seasons are excluded by the filter
seasons.retain(|s| url_filter.is_season_valid(s.metadata.season_number))
} }
if !archive.yes && !find_multiple_seasons_with_same_number(&seasons).is_empty() { if !archive.yes && !find_multiple_seasons_with_same_number(&seasons).is_empty() {

11
crunchy-cli-core/src/cli/download.rs
View file

@ -349,7 +349,10 @@ async fn formats_from_series(
seasons.retain(|s| { seasons.retain(|s| {
s.metadata.season_number != season.first().unwrap().metadata.season_number s.metadata.season_number != season.first().unwrap().metadata.season_number
|| s.metadata.audio_locales.contains(&download.audio) || s.metadata.audio_locales.contains(&download.audio)
}) });
// remove seasons which match the url filter. this is mostly done to not trigger the
// interactive season choosing when dupilcated seasons are excluded by the filter
seasons.retain(|s| url_filter.is_season_valid(s.metadata.season_number))
} }
if !download.yes && !find_multiple_seasons_with_same_number(&seasons).is_empty() { if !download.yes && !find_multiple_seasons_with_same_number(&seasons).is_empty() {
@ -373,14 +376,14 @@ async fn formats_from_season(
season: Media<Season>, season: Media<Season>,
url_filter: &UrlFilter, url_filter: &UrlFilter,
) -> Result<Option<Vec<Format>>> { ) -> Result<Option<Vec<Format>>> {
if !season.metadata.audio_locales.contains(&download.audio) { if !url_filter.is_season_valid(season.metadata.season_number) {
return Ok(None);
} else if !season.metadata.audio_locales.contains(&download.audio) {
error!( error!(
"Season {} ({}) is not available with {} audio", "Season {} ({}) is not available with {} audio",
season.metadata.season_number, season.title, download.audio season.metadata.season_number, season.title, download.audio
); );
return Ok(None); return Ok(None);
} else if !url_filter.is_season_valid(season.metadata.season_number) {
return Ok(None);
} }
let mut formats = vec![]; let mut formats = vec![];