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

Rework episode filtering

Browse source
This commit is contained in:
bytedream 2024-06-14 00:17:08 +02:00
parent e7ac6d8874
commit 287df84382
11 changed files with 515 additions and 833 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crunchy-cli-core/src/search/format.rs
View file

@ -241,14 +241,6 @@ macro_rules! must_match_if_true {
};
}
macro_rules! self_and_versions {
($var:expr => $audio:expr) => {{
let mut items = vec![$var.clone()];
items.extend($var.clone().version($audio).await?);
items
}};
}
pub struct Format {
pattern: Vec<(Range<usize>, Scope, String)>,
pattern_count: HashMap<Scope, u32>,
@ -421,7 +413,15 @@ impl Format {
};
let mut seasons = vec![];
for season in tmp_seasons {
seasons.extend(self_and_versions!(season => self.filter_options.audio.clone()))
seasons.push(season.clone());
for version in season.versions {
if season.id == version.id {
continue;
}
if self.filter_options.audio.contains(&version.audio_locale) {
seasons.push(version.season().await?)
}
}
}
tree.extend(
self.filter_options
@ -435,7 +435,15 @@ impl Format {
if !episode_empty || !stream_empty {
match &media_collection {
MediaCollection::Episode(episode) => {
let episodes = self_and_versions!(episode => self.filter_options.audio.clone());
let mut episodes = vec![episode.clone()];
for version in &episode.versions {
if episode.id == version.id {
continue;
}
if self.filter_options.audio.contains(&version.audio_locale) {
episodes.push(version.episode().await?)
}
}
tree.push((
Season::default(),
episodes