From f7af9835263457ff5e69611fe2a1a597fbb0fb82 Mon Sep 17 00:00:00 2001 From: bytedream Date: Tue, 20 Jun 2023 00:19:59 +0200 Subject: [PATCH] Remove search --filter-subtitles flag --- crunchy-cli-core/src/search/command.rs | 5 ----- crunchy-cli-core/src/search/filter.rs | 9 --------- crunchy-cli-core/src/search/format.rs | 5 +---- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/crunchy-cli-core/src/search/command.rs b/crunchy-cli-core/src/search/command.rs index ac82d8c..e81ef8d 100644 --- a/crunchy-cli-core/src/search/command.rs +++ b/crunchy-cli-core/src/search/command.rs @@ -17,10 +17,6 @@ pub struct Search { #[arg(long, default_values_t = vec![crate::utils::locale::system_locale()])] audio: Vec, - #[arg(help = "Filter the locale/language of subtitles according to the value of `--audio`")] - #[arg(long, default_value_t = false)] - filter_subtitles: bool, - #[arg(help = "Limit of search top search results")] #[arg(long, default_value_t = 5)] search_top_results_limit: u32, @@ -144,7 +140,6 @@ impl Execute for Search { for (media_collection, url_filter) in input { let filter_options = FilterOptions { audio: self.audio.clone(), - filter_subtitles: self.filter_subtitles, url_filter, }; diff --git a/crunchy-cli-core/src/search/filter.rs b/crunchy-cli-core/src/search/filter.rs index 6a8e4ee..0b31823 100644 --- a/crunchy-cli-core/src/search/filter.rs +++ b/crunchy-cli-core/src/search/filter.rs @@ -1,10 +1,8 @@ use crate::utils::parse::UrlFilter; -use crunchyroll_rs::media::Subtitle; use crunchyroll_rs::{Episode, Locale, MovieListing, Season, Series}; pub struct FilterOptions { pub audio: Vec, - pub filter_subtitles: bool, pub url_filter: UrlFilter, } @@ -40,13 +38,6 @@ impl FilterOptions { ) } - pub fn filter_subtitles(&self, mut subtitles: Vec) -> Vec { - if self.filter_subtitles { - subtitles.retain(|s| self.check_audio_language(&vec![s.locale.clone()])) - } - subtitles - } - fn check_audio_language(&self, audio: &Vec) -> bool { if !self.audio.is_empty() { return self.audio.iter().any(|a| audio.contains(a)); diff --git a/crunchy-cli-core/src/search/format.rs b/crunchy-cli-core/src/search/format.rs index cfdba3a..6769c4c 100644 --- a/crunchy-cli-core/src/search/format.rs +++ b/crunchy-cli-core/src/search/format.rs @@ -605,12 +605,9 @@ impl Format { .subtitles .insert(Locale::Custom("".to_string()), Subtitle::default()); } - let subtitles = self - .filter_options - .filter_subtitles(stream.subtitles.into_values().collect()); let mut output = vec![]; - for subtitle in subtitles { + for (_, subtitle) in stream.subtitles { let subtitle_map = self.serializable_to_json_map(FormatSubtitle::from(&subtitle)); let mut tmp_values = values.clone(); tmp_values.insert(Scope::Subtitle, &subtitle_map);