Skip to content

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

feat: implement new startup UI, update cache schema, and improve language parsing for FourKHdHub provider

Samir Hossainsbfa77641297c
diff --git a/src/cache.rs b/src/cache.rs
index 8a868d4..af8a1f8 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -52,7 +52,7 @@ pub fn get_provider_stream_path(
) -> PathBuf {
let mut path = get_provider_cache_dir(provider, "streams");
let schema = if provider == ProviderKind::FourKHdHub {
- "v2_"
+ "v3_"
} else {
""
};
diff --git a/src/providers/fourkhdhub/parser.rs b/src/providers/fourkhdhub/parser.rs
index a52da5a..a234e37 100644
--- a/src/providers/fourkhdhub/parser.rs
+++ b/src/providers/fourkhdhub/parser.rs
@@ -132,6 +132,8 @@ pub fn parse_releases(
};
let link_selector = selector("a[href]")?;
let size_selector = selector(".badge-size, .badge")?;
+ let page_language =
+ find_metadata(&document, "Audios:").and_then(|value| normalize_language_label(&value));
let mut grouped: HashMap<String, Release> = HashMap::new();
for item in document.select(&item_selector) {
@@ -171,7 +173,7 @@ pub fn parse_releases(
provider: ProviderKind::FourKHdHub,
quality: detect_quality(&filename),
codec: detect_codec(&filename),
- language: detect_language(&filename),
+ language: detect_language(&filename).or_else(|| page_language.clone()),
size_bytes: size_text.as_deref().and_then(parse_size_bytes),
season: parsed_episode.map(|value| value.0),
episode: parsed_episode.map(|value| value.1),
@@ -470,10 +472,34 @@ fn detect_language(value: &str) -> Option<String> {
(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())
+ }
_ => None,
}
}
+fn normalize_language_label(value: &str) -> Option<String> {
+ let value = value
+ .split(['|', '/', '+'])
+ .map(str::trim)
+ .filter(|part| !part.is_empty())
+ .collect::<Vec<_>>()
+ .join(", ");
+ if value.is_empty()
+ || value.len() > 80
+ || matches!(
+ value.to_ascii_lowercase().as_str(),
+ "n/a" | "na" | "unknown"
+ )
+ {
+ None
+ } else {
+ Some(value)
+ }
+}
+
fn is_archive(value: &str) -> bool {
let lower = value.to_ascii_lowercase();
lower.ends_with(".zip") || lower.contains("complete season") || lower.contains("season pack")
@@ -590,6 +616,42 @@ mod tests {
assert_eq!(releases[0].episode, Some(1));
}
+ #[test]
+ fn release_language_falls_back_to_page_audio_metadata() {
+ let html = r#"
+ <div class="metadata-item">
+ <span class="metadata-label">Audios:</span>
+ <span class="metadata-value">English</span>
+ </div>
+ <div id="episodes">
+ <div class="episode-download-item">
+ <div class="episode-file-title">Show.S01E01.2160p.DDP5.1.H.265.mkv</div>
+ <a href="https://hubcloud.ist/drive/english">HubCloud</a>
+ </div>
+ </div>
+ "#;
+ let releases = parse_releases(html, 1, 1).expect("fixture parses");
+ assert_eq!(releases[0].language.as_deref(), Some("English"));
+ }
+
+ #[test]
+ fn filename_language_takes_priority_over_page_audio_metadata() {
+ let html = r#"
+ <div class="metadata-item">
+ <span class="metadata-label">Audios:</span>
+ <span class="metadata-value">Hindi | English</span>
+ </div>
+ <div id="episodes">
+ <div class="episode-download-item">
+ <div class="episode-file-title">Show.S01E01.1080p.English.H.264.mkv</div>
+ <a href="https://hubcloud.ist/drive/english">HubCloud</a>
+ </div>
+ </div>
+ "#;
+ let releases = parse_releases(html, 1, 1).expect("fixture parses");
+ assert_eq!(releases[0].language.as_deref(), Some("English"));
+ }
+
#[test]
fn compatibility_release_payload_is_an_array() {
let payload = releases_to_moviebox_json(&[Release {
diff --git a/src/tui/screens/startup.rs b/src/tui/screens/startup.rs
index 1875973..d2e0514 100644
--- a/src/tui/screens/startup.rs
+++ b/src/tui/screens/startup.rs
@@ -2,81 +2,163 @@ use crate::tui::{state::AppState, theme::Theme};
use ratatui::{
Frame,
layout::{Alignment, Constraint, Direction, Layout, Rect},
+ style::Modifier,
text::{Line, Span},
- widgets::Paragraph,
+ widgets::{Block, BorderType, Borders, Gauge, Padding, Paragraph},
};
const QUOTES: &[&str] = &[
- "\"Talk is cheap. Show me the code.\" - Linus Torvalds",
- "\"First, solve the problem. Then, write the code.\" - John Johnson",
- "\"Experience is the name everyone gives to their mistakes.\" - Oscar Wilde",
- "\"Code is like humor. When you have to explain it, it’s bad.\" - Cory House",
- "\"Fix the cause, not the symptom.\" - Steve Maguire",
- "\"Simplicity is the soul of efficiency.\" - Austin Freeman",
- "\"Before software can be reusable it first has to be usable.\" - Ralph Johnson",
- "\"Make it work, make it right, make it fast.\" - Kent Beck",
- "\"There is no elevator to success, you have to take the stairs.\" - Zig Ziglar",
+ "\"Talk is cheap. Show me the code.\" — Linus Torvalds",
+ "\"First, solve the problem. Then, write the code.\" — John Johnson",
+ "\"Fix the cause, not the symptom.\" — Steve Maguire",
+ "\"Simplicity is the soul of efficiency.\" — Austin Freeman",
+ "\"Make it work, make it right, make it fast.\" — Kent Beck",
];
pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme) {
- let chunks = Layout::default()
- .direction(Direction::Vertical)
- .constraints([
- Constraint::Percentage(35),
- Constraint::Length(8),
- Constraint::Percentage(35),
- ])
- .split(area);
+ let panel = centered_rect(68.min(area.width.saturating_sub(4)), 15, area);
+ let block = Block::default()
+ .title(Line::from(vec![
+ Span::styled(" MOVIEBOX ", theme.title),
+ Span::styled("· STARTUP ", theme.text_dim),
+ ]))
+ .title_alignment(Alignment::Center)
+ .borders(Borders::ALL)
+ .border_type(BorderType::Rounded)
+ .border_style(theme.border_focus)
+ .padding(Padding::new(3, 3, 1, 1));
+ let inner = block.inner(panel);
+ frame.render_widget(block, panel);
- let inner_chunks = Layout::default()
+ let rows = Layout::default()
.direction(Direction::Vertical)
.constraints([
+ Constraint::Length(1),
Constraint::Length(2),
- Constraint::Length(2),
- Constraint::Length(2),
+ Constraint::Length(1),
+ Constraint::Length(1),
+ Constraint::Length(1),
+ Constraint::Length(1),
+ Constraint::Min(0),
])
- .split(chunks[1]);
+ .split(inner);
- let spinner_frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
- let spinner = spinner_frames[(state.tick_count as usize / 5) % spinner_frames.len()];
+ let (active_step, status_text) = if state.updater_done {
+ (2, "Update installed. Restarting MovieBox…".to_string())
+ } else if state.updater_progress.is_some() {
+ (
+ 1,
+ state
+ .updater_status
+ .clone()
+ .unwrap_or_else(|| "Downloading the latest release…".to_string()),
+ )
+ } else {
+ (0, "Checking GitHub for a newer release…".to_string())
+ };
- let quote = QUOTES[(state.tick_count as usize / 300) % QUOTES.len()];
+ frame.render_widget(
+ Paragraph::new(Line::from(vec![
+ Span::styled("01 CHECK", step_style(active_step, 0, theme)),
+ Span::styled(" ───── ", theme.muted),
+ Span::styled("02 INSTALL", step_style(active_step, 1, theme)),
+ Span::styled(" ───── ", theme.muted),
+ Span::styled("03 LAUNCH", step_style(active_step, 2, theme)),
+ ]))
+ .alignment(Alignment::Center),
+ rows[0],
+ );
- let status_line = if state.updater_done {
- Line::from(vec![Span::styled(
- "Update complete! Restarting...",
- theme.accent,
- )])
- } else if let Some(prog) = state.updater_progress {
- let p = (prog * 100.0) as u16;
- let filled = (p / 5) as usize;
- let empty = 20 - filled;
- let bar = format!("{}{}", "█".repeat(filled), "░".repeat(empty));
- Line::from(vec![
- Span::styled(format!("{} Downloading Update... ", spinner), theme.text),
- Span::styled(format!("[{}] {}%", bar, p), theme.rating),
- ])
+ let spinner_frames = ['◐', '◓', '◑', '◒'];
+ let spinner = spinner_frames[(state.tick_count as usize / 3) % spinner_frames.len()];
+ let status_style = if state.updater_done {
+ theme.success.add_modifier(Modifier::BOLD)
} else {
- Line::from(vec![Span::styled(
- format!("{} Checking for updates...", spinner),
- theme.text_dim,
- )])
+ theme.text
};
+ frame.render_widget(
+ Paragraph::new(Line::from(vec![
+ Span::styled(format!("{spinner} "), theme.accent),
+ Span::styled(status_text, status_style),
+ ]))
+ .alignment(Alignment::Center),
+ rows[2],
+ );
+
+ if let Some(progress) = state.updater_progress {
+ let progress = progress.clamp(0.0, 1.0);
+ let label = if state.updater_done {
+ "READY".to_string()
+ } else {
+ format!("{:>3}%", (progress * 100.0).round() as u16)
+ };
+ frame.render_widget(
+ Gauge::default()
+ .gauge_style(if state.updater_done {
+ theme.success
+ } else {
+ theme.accent
+ })
+ .label(Span::styled(label, theme.text.add_modifier(Modifier::BOLD)))
+ .ratio(progress),
+ rows[4],
+ );
+ } else {
+ let pulse =
+ ["● · ·", "· ● ·", "· · ●", "· ● ·"][(state.tick_count as usize / 4) % 4];
+ frame.render_widget(
+ Paragraph::new(Span::styled(pulse, theme.accent)).alignment(Alignment::Center),
+ rows[4],
+ );
+ }
- let title = Paragraph::new(Line::from(vec![Span::styled(
- "MovieBox TUI",
- theme.header.add_modifier(ratatui::style::Modifier::BOLD),
- )]))
- .alignment(Alignment::Center);
+ let detail = if state.updater_progress.is_some() && !state.updater_done {
+ QUOTES[(state.tick_count as usize / 300) % QUOTES.len()]
+ } else if state.updater_done {
+ "Your new version is ready."
+ } else {
+ "This only takes a moment. Your library stays untouched."
+ };
+ frame.render_widget(
+ Paragraph::new(Span::styled(detail, theme.text_dim)).alignment(Alignment::Center),
+ rows[6],
+ );
- let status = Paragraph::new(status_line).alignment(Alignment::Center);
+ let footer = Rect {
+ x: panel.x,
+ y: panel.y.saturating_add(panel.height),
+ width: panel.width,
+ height: 1,
+ };
+ frame.render_widget(
+ Paragraph::new(Line::from(vec![
+ Span::styled("CURRENT ", theme.muted),
+ Span::styled(
+ format!("v{}", env!("CARGO_PKG_VERSION")),
+ theme.text_dim.add_modifier(Modifier::BOLD),
+ ),
+ Span::styled(" • AUTOMATIC UPDATES ON", theme.muted),
+ ]))
+ .alignment(Alignment::Center),
+ footer,
+ );
+}
- let quote_para = Paragraph::new(Line::from(vec![Span::styled(quote, theme.text_dim)]))
- .alignment(Alignment::Center);
+fn step_style(active: usize, step: usize, theme: &Theme) -> ratatui::style::Style {
+ if step < active {
+ theme.success.add_modifier(Modifier::BOLD)
+ } else if step == active {
+ theme.accent.add_modifier(Modifier::BOLD)
+ } else {
+ theme.muted
+ }
+}
- frame.render_widget(title, inner_chunks[0]);
- frame.render_widget(status, inner_chunks[1]);
- if state.updater_progress.is_some() && !state.updater_done {
- frame.render_widget(quote_para, inner_chunks[2]);
+fn centered_rect(width: u16, height: u16, area: Rect) -> Rect {
+ Rect {
+ x: area.x + area.width.saturating_sub(width) / 2,
+ y: area.y + area.height.saturating_sub(height) / 2,
+ width,
+ height: height.min(area.height),
}
}