Skip to content

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

feat(download): add media naming standards, subtitle language tags, and duplication prevention

Samir Hossains83bbfe35702d
diff --git a/src/providers/moviebox/title.rs b/src/providers/moviebox/title.rs
index f0ff3ec..0a6db7b 100644
--- a/src/providers/moviebox/title.rs
+++ b/src/providers/moviebox/title.rs
@@ -72,3 +72,50 @@ pub fn clean_moviebox_title(raw_title: &str) -> String {
.trim()
.to_string()
}
+
+pub fn language_to_code(name: &str) -> Option<&'static str> {
+ let lower = name.trim().to_lowercase();
+ match lower.as_str() {
+ "english" | "en" | "eng" => Some("en"),
+ "spanish" | "es" | "spa" | "español" | "castellano" => Some("es"),
+ "hindi" | "hi" | "hin" => Some("hi"),
+ "french" | "fr" | "fre" | "fra" | "français" => Some("fr"),
+ "german" | "de" | "ger" | "deu" | "deutsch" => Some("de"),
+ "italian" | "it" | "ita" | "italiano" => Some("it"),
+ "japanese" | "ja" | "jpn" | "日本語" => Some("ja"),
+ "korean" | "ko" | "kor" | "한국어" => Some("ko"),
+ "chinese" | "zh" | "zho" | "chi" | "中文" | "mandarin" | "cantonese" => Some("zh"),
+ "portuguese" | "pt" | "por" | "português" => Some("pt"),
+ "russian" | "ru" | "rus" | "русский" => Some("ru"),
+ "arabic" | "ar" | "ara" | "العربية" => Some("ar"),
+ "turkish" | "tr" | "tur" | "türkçe" => Some("tr"),
+ "bengali" | "bn" | "ben" | "বাংলা" => Some("bn"),
+ "tamil" | "ta" | "tam" | "தமிழ்" => Some("ta"),
+ "telugu" | "te" | "tel" | "తెలుగు" => Some("te"),
+ "malayalam" | "ml" | "mal" | "മലയാളം" => Some("ml"),
+ "kannada" | "kn" | "kan" | "ಕನ್ನಡ" => Some("kn"),
+ "marathi" | "mr" | "mar" | "मराठी" => Some("mr"),
+ "punjabi" | "pa" | "pan" | "ਪੰਜਾਬੀ" => Some("pa"),
+ "gujarati" | "gu" | "guj" | "ગુજરાતી" => Some("gu"),
+ "urdu" | "ur" | "urd" | "اردو" => Some("ur"),
+ "indonesian" | "id" | "ind" | "bahasa" => Some("id"),
+ "thai" | "th" | "tha" | "ไทย" => Some("th"),
+ "vietnamese" | "vi" | "vie" | "tiếng việt" => Some("vi"),
+ "dutch" | "nl" | "dut" | "nld" | "nederlands" => Some("nl"),
+ "polish" | "pl" | "pol" | "polski" => Some("pl"),
+ "swedish" | "sv" | "swe" | "svenska" => Some("sv"),
+ "danish" | "da" | "dan" | "dansk" => Some("da"),
+ "norwegian" | "no" | "nor" | "norsk" => Some("no"),
+ "finnish" | "fi" | "fin" | "suomi" => Some("fi"),
+ "greek" | "el" | "ell" | "gre" | "ελληνικά" => Some("el"),
+ "hebrew" | "he" | "heb" | "עברית" => Some("he"),
+ "czech" | "cs" | "cze" | "ces" | "čeština" => Some("cs"),
+ "hungarian" | "hu" | "hun" | "magyar" => Some("hu"),
+ "romanian" | "ro" | "rum" | "ron" | "română" => Some("ro"),
+ "ukrainian" | "uk" | "ukr" | "українська" => Some("uk"),
+ "persian" | "fa" | "fas" | "per" | "فارسی" => Some("fa"),
+ "tagalog" | "tl" | "fil" | "filipino" => Some("tl"),
+ "malay" | "ms" | "msa" | "may" | "melayu" => Some("ms"),
+ _ => None,
+ }
+}
diff --git a/src/tui/app/download.rs b/src/tui/app/download.rs
index 53173e4..d40b652 100644
--- a/src/tui/app/download.rs
+++ b/src/tui/app/download.rs
@@ -127,7 +127,7 @@ impl App {
.join("Series")
.join(&safe_title)
.join(format!("Season {season}")),
- format!("{safe_title}_S{season:02}E{episode:02}"),
+ format!("{safe_title} - S{season:02}E{episode:02}"),
)
} else {
(
@@ -135,13 +135,23 @@ impl App {
safe_title.clone(),
)
};
- let mut destination = target_dir.join(format!("{base_name}.{extension}"));
- let mut counter = 2;
- while destination.exists() {
- destination = target_dir.join(format!("{base_name}_{counter}.{extension}"));
- counter += 1;
+ let destination = target_dir.join(format!("{base_name}.{extension}"));
+ if is_media_already_downloaded(&target_dir, &base_name) {
+ self.state.is_waiting_for_download_stream = false;
+ self.state.notify(
+ NotificationKind::Warning,
+ "Already downloaded",
+ format!("{base_name} already exists on disk."),
+ );
+ return;
}
+ let sub_lang = self
+ .state
+ .last_download_subtitle_language
+ .take()
+ .or_else(|| self.state.season_subtitle_preference.clone());
+
self.state.is_waiting_for_download_stream = false;
self.state.download_status = Some("Preparing download...".into());
self.state.download_progress = Some(0.0);
@@ -186,7 +196,19 @@ impl App {
matches!(extension.as_str(), "srt" | "vtt" | "ass" | "ssa" | "sub")
})
.unwrap_or_else(|| "srt".to_string());
- let subtitle_path = destination.with_extension(subtitle_extension);
+
+ let lang_code = sub_lang
+ .as_deref()
+ .and_then(crate::providers::moviebox::title::language_to_code)
+ .or_else(|| subtitle_language_from_url(&subtitle_url));
+
+ let final_ext = if let Some(code) = lang_code {
+ format!("{code}.{subtitle_extension}")
+ } else {
+ subtitle_extension
+ };
+
+ let subtitle_path = destination.with_extension(final_ext);
let result = tokio::time::timeout(
std::time::Duration::from_secs(30),
client.get(subtitle_url).send(),
@@ -445,6 +467,50 @@ impl App {
let total = self.state.download_queue_total;
let num = total - remaining;
+ let raw_title = self
+ .state
+ .selected_details
+ .as_ref()
+ .and_then(|details| details.get("title"))
+ .and_then(|title| title.as_str())
+ .unwrap_or("MovieBox-Tui_Stream");
+ let clean_title = crate::providers::moviebox::clean_moviebox_title(raw_title);
+ let safe_title = clean_title
+ .chars()
+ .map(|c| {
+ if c.is_alphanumeric() || c == '-' || c == '_' || c == ' ' {
+ c
+ } else {
+ ' '
+ }
+ })
+ .collect::<String>();
+ let safe_title = safe_title.split_whitespace().collect::<Vec<_>>().join(" ");
+ let safe_title = if safe_title.is_empty() {
+ "MovieBox-Tui_Stream".to_string()
+ } else {
+ safe_title
+ };
+
+ let base_dir = self.resolve_download_base_dir();
+ let target_dir = base_dir
+ .join("Series")
+ .join(&safe_title)
+ .join(format!("Season {season}"));
+ let base_name = format!("{safe_title} - S{season:02}E{episode:02}");
+
+ if is_media_already_downloaded(&target_dir, &base_name) {
+ self.state.notify(
+ NotificationKind::Info,
+ "Skipping episode",
+ format!(
+ "S{season:02}E{episode:02} already downloaded ({num}/{total})."
+ ),
+ );
+ self.action_sender.send(Action::ProcessDownloadQueue).ok();
+ return None;
+ }
+
self.state.notify(
NotificationKind::Info,
"Preparing episode",
@@ -571,3 +637,108 @@ impl App {
None
}
}
+
+fn subtitle_language_from_url(url: &str) -> Option<&'static str> {
+ let lower = url.to_lowercase();
+ if lower.contains(".en.")
+ || lower.contains("_en.")
+ || lower.contains("/en/")
+ || lower.contains("english")
+ {
+ Some("en")
+ } else if lower.contains(".es.")
+ || lower.contains("_es.")
+ || lower.contains("/es/")
+ || lower.contains("spanish")
+ {
+ Some("es")
+ } else if lower.contains(".hi.")
+ || lower.contains("_hi.")
+ || lower.contains("/hi/")
+ || lower.contains("hindi")
+ {
+ Some("hi")
+ } else if lower.contains(".fr.")
+ || lower.contains("_fr.")
+ || lower.contains("/fr/")
+ || lower.contains("french")
+ {
+ Some("fr")
+ } else if lower.contains(".de.")
+ || lower.contains("_de.")
+ || lower.contains("/de/")
+ || lower.contains("german")
+ {
+ Some("de")
+ } else if lower.contains(".ar.")
+ || lower.contains("_ar.")
+ || lower.contains("/ar/")
+ || lower.contains("arabic")
+ {
+ Some("ar")
+ } else if lower.contains(".pt.")
+ || lower.contains("_pt.")
+ || lower.contains("/pt/")
+ || lower.contains("portuguese")
+ {
+ Some("pt")
+ } else if lower.contains(".ru.")
+ || lower.contains("_ru.")
+ || lower.contains("/ru/")
+ || lower.contains("russian")
+ {
+ Some("ru")
+ } else if lower.contains(".ja.")
+ || lower.contains("_ja.")
+ || lower.contains("/ja/")
+ || lower.contains("japanese")
+ {
+ Some("ja")
+ } else if lower.contains(".ko.")
+ || lower.contains("_ko.")
+ || lower.contains("/ko/")
+ || lower.contains("korean")
+ {
+ Some("ko")
+ } else if lower.contains(".zh.")
+ || lower.contains("_zh.")
+ || lower.contains("/zh/")
+ || lower.contains("chinese")
+ {
+ Some("zh")
+ } else if lower.contains(".it.")
+ || lower.contains("_it.")
+ || lower.contains("/it/")
+ || lower.contains("italian")
+ {
+ Some("it")
+ } else if lower.contains(".bn.")
+ || lower.contains("_bn.")
+ || lower.contains("/bn/")
+ || lower.contains("bengali")
+ {
+ Some("bn")
+ } else {
+ None
+ }
+}
+
+fn is_media_already_downloaded(target_dir: &std::path::Path, base_name: &str) -> bool {
+ let extensions = ["mp4", "mkv", "webm", "ts"];
+ for ext in extensions {
+ let final_file = target_dir.join(format!("{base_name}.{ext}"));
+ if final_file.exists() {
+ let part_json = target_dir.join(format!("{base_name}.{ext}.part.json"));
+ let part_file = target_dir.join(format!("{base_name}.{ext}.part"));
+ let part_0 = target_dir.join(format!("{base_name}.{ext}.part.0"));
+ if !part_json.exists() && !part_file.exists() && !part_0.exists() {
+ if let Ok(metadata) = std::fs::metadata(&final_file) {
+ if metadata.len() > 1024 * 1024 {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ false
+}
diff --git a/src/tui/app/navigation.rs b/src/tui/app/navigation.rs
index ab26b2b..a50ce92 100644
--- a/src/tui/app/navigation.rs
+++ b/src/tui/app/navigation.rs
@@ -768,8 +768,11 @@ impl App {
let sub_url = self.state.subtitle_list.get(idx).map(|(_, u)| u.clone());
let sub_url_final = sub_url.filter(|s| !s.is_empty());
- if self.state.download_queue_total > 0 {
- self.state.season_subtitle_preference = sub_name.filter(|n| n != "None");
+ if let Some(name) = sub_name.filter(|n| n != "None") {
+ self.state.last_download_subtitle_language = Some(name.clone());
+ if self.state.download_queue_total > 0 {
+ self.state.season_subtitle_preference = Some(name);
+ }
}
self.action_sender
diff --git a/src/tui/state.rs b/src/tui/state.rs
index 8f19f6a..f21aad9 100644
--- a/src/tui/state.rs
+++ b/src/tui/state.rs
@@ -257,6 +257,7 @@ pub struct AppState {
pub subtitle_popup: bool,
pub is_download_subtitle_popup: bool,
pub season_subtitle_preference: Option<String>,
+ pub last_download_subtitle_language: Option<String>,
pub subtitle_list: Vec<(String, String)>,
pub subtitle_list_state: ListState,
pub pending_play_link: Option<String>,
@@ -387,6 +388,7 @@ impl Default for AppState {
subtitle_popup: false,
is_download_subtitle_popup: false,
season_subtitle_preference: None,
+ last_download_subtitle_language: None,
subtitle_list: Vec::new(),
subtitle_list_state: ListState::default(),
pending_play_link: None,