Skip to content

Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.

fix(fourkhdhub): detect all multilingual audio tracks in release titles

Samir Hossains9044c4793d26
diff --git a/src/providers/fourkhdhub/parser.rs b/src/providers/fourkhdhub/parser.rs
index e4339ba..02d2cb4 100644
--- a/src/providers/fourkhdhub/parser.rs
+++ b/src/providers/fourkhdhub/parser.rs
@@ -470,21 +470,95 @@ fn detect_codec(value: &str) -> Option<String> {
fn detect_language(value: &str) -> Option<String> {
let lower = value.to_ascii_lowercase();
- match (lower.contains("hindi"), lower.contains("english")) {
- (true, true) => Some("Hindi, English".into()),
- (true, false) => Some("Hindi".into()),
- (false, true) => Some("English".into()),
- _ if lower.contains("dual audio") => Some("Dual Audio".into()),
- _ if lower.contains("multi audio") || lower.contains("multi-audio") => {
- Some("Multi Audio".into())
+
+ let lang_patterns: &[(&[&str], &str)] = &[
+ (&["hindi", "hin"], "Hindi"),
+ (&["english", "eng"], "English"),
+ (&["tamil", "tam"], "Tamil"),
+ (&["telugu", "tel"], "Telugu"),
+ (&["kannada", "kan"], "Kannada"),
+ (&["malayalam", "mal"], "Malayalam"),
+ (&["bengali", "ben", "bangla"], "Bengali"),
+ (&["marathi", "mar"], "Marathi"),
+ (&["punjabi", "pan", "pun"], "Punjabi"),
+ (&["gujarati", "guj"], "Gujarati"),
+ (&["urdu", "urd"], "Urdu"),
+ (&["japanese", "jap", "jpn"], "Japanese"),
+ (&["korean", "kor"], "Korean"),
+ (&["chinese", "chi", "mandarin", "cantonese"], "Chinese"),
+ (&["spanish", "spa", "esp", "castilian"], "Spanish"),
+ (&["french", "fre", "fra"], "French"),
+ (&["german", "ger", "deu"], "German"),
+ (&["italian", "ita"], "Italian"),
+ (&["portuguese", "por"], "Portuguese"),
+ (&["russian", "rus"], "Russian"),
+ (&["arabic", "ara"], "Arabic"),
+ (&["turkish", "tur"], "Turkish"),
+ (&["thai"], "Thai"),
+ (&["indonesian", "ind"], "Indonesian"),
+ (&["vietnamese", "vie"], "Vietnamese"),
+ (&["polish", "pol"], "Polish"),
+ (&["dutch", "dut", "nld"], "Dutch"),
+ (&["swedish", "swe"], "Swedish"),
+ (&["danish", "dan"], "Danish"),
+ (&["norwegian", "nor"], "Norwegian"),
+ (&["finnish", "fin"], "Finnish"),
+ ];
+
+ let mut found_langs: Vec<(usize, &str)> = Vec::new();
+
+ for (patterns, lang_name) in lang_patterns {
+ for pattern in *patterns {
+ let mut search_idx = 0;
+ while let Some(pos) = lower[search_idx..].find(pattern) {
+ let actual_pos = search_idx + pos;
+ let end_pos = actual_pos + pattern.len();
+
+ let prev_ok = actual_pos == 0 || {
+ let prev_char = lower[..actual_pos].chars().last().unwrap();
+ !prev_char.is_alphabetic()
+ };
+ let next_ok = end_pos >= lower.len() || {
+ let next_char = lower[end_pos..].chars().next().unwrap();
+ !next_char.is_alphabetic()
+ };
+
+ if prev_ok && next_ok {
+ if !found_langs.iter().any(|(_, name)| *name == *lang_name) {
+ found_langs.push((actual_pos, lang_name));
+ }
+ break;
+ }
+ search_idx = actual_pos + 1;
+ }
}
- _ => None,
+ }
+
+ if !found_langs.is_empty() {
+ found_langs.sort_by_key(|(pos, _)| *pos);
+ let joined = found_langs
+ .into_iter()
+ .map(|(_, name)| name)
+ .collect::<Vec<_>>()
+ .join(", ");
+ return Some(joined);
+ }
+
+ if lower.contains("multi audio") || lower.contains("multi-audio") {
+ Some("Multi Audio".into())
+ } else if lower.contains("dual audio") || lower.contains("dual-audio") {
+ Some("Dual Audio".into())
+ } else {
+ None
}
}
fn normalize_language_label(value: &str) -> Option<String> {
+ if let Some(detected) = detect_language(value) {
+ return Some(detected);
+ }
let value = value
- .split(['|', '/', '+'])
+ .split(['|', '/', '+', ','])
.map(str::trim)
.filter(|part| !part.is_empty())
.collect::<Vec<_>>()
diff --git a/src/tui/screens/details.rs b/src/tui/screens/details.rs
index 7bfe1d9..b12ebcb 100644
--- a/src/tui/screens/details.rs
+++ b/src/tui/screens/details.rs
@@ -881,17 +881,25 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
Span::styled(format!("{codec:<8}"), secondary_style),
];
if is_fourk && stream_width >= 58 {
- stream_spans
- .push(Span::styled(format!("{language:<16}"), secondary_style));
+ let mirror_str = format!(
+ "{source_count} mirror{}",
+ if source_count == 1 { "" } else { "s" }
+ );
+ let mirror_width = mirror_str.len() + 2;
+ let max_lang_width = stream_width.saturating_sub(9 + 8 + mirror_width);
+ let display_lang =
+ crate::tui::text::truncate_width(language, max_lang_width);
stream_spans.push(Span::styled(
- format!(
- "{source_count} mirror{}",
- if source_count == 1 { "" } else { "s" }
- ),
+ format!("{display_lang:<16} "),
secondary_style,
));
+ stream_spans.push(Span::styled(mirror_str, secondary_style));
} else if is_fourk && stream_width >= 38 {
- stream_spans.push(Span::styled(language.to_string(), secondary_style));
+ let max_lang_width = stream_width.saturating_sub(9 + 8 + 2);
+ let display_lang =
+ crate::tui::text::truncate_width(language, max_lang_width);
+ stream_spans
+ .push(Span::styled(display_lang.to_string(), secondary_style));
} else if !is_fourk && stream_width >= 64 {
let fixed_width = 9 + 8 + 12;
let uploader = crate::tui::text::truncate_width(