Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
refactor(core): centralize app paths, border types, and mode announcements
Samir Hossains04cdedceea68
diff --git a/src/cache.rs b/src/cache.rsindex 36037df..d907c30 100644--- a/src/cache.rs+++ b/src/cache.rs@@ -123,7 +123,7 @@ fn hash_key(value: &str) -> String {pub fn get_provider_cache_dir(provider: ProviderKind, subdir: &str) -> PathBuf {let mut path = dirs::cache_dir().unwrap_or_else(std::env::temp_dir);- path.push("moviebox-tui");+ path.push(crate::config::APP_NAME);path.push(provider.cache_key());path.push(subdir);if !path.exists() {@@ -264,12 +264,12 @@ pub fn invalidate_provider_stream_cache(pub fn clear_all_cache() {let mut path = dirs::cache_dir().unwrap_or_else(std::env::temp_dir);- path.push("moviebox-tui");+ path.push(crate::config::APP_NAME);if path.exists() {let _ = fs::remove_dir_all(&path);}if let Some(data_dir) = dirs::data_dir() {- let legacy = data_dir.join("moviebox-tui").join("iptv_cache");+ let legacy = data_dir.join(crate::config::APP_NAME).join("iptv_cache");if legacy.exists() {let _ = fs::remove_dir_all(&legacy);}@@ -279,7 +279,7 @@ pub fn clear_all_cache() {pub fn clean_old_cache_background() {tokio::task::spawn_blocking(|| {let mut path = dirs::cache_dir().unwrap_or_else(std::env::temp_dir);- path.push("moviebox-tui");+ path.push(crate::config::APP_NAME);if !path.exists() {return;}@@ -326,7 +326,7 @@ pub fn set_homepage_cache(tab_id: &str, page: usize, data: &serde_json::Value) {fn get_namespaced_image_path(namespace: &str, id: &str) -> PathBuf {let mut path = dirs::cache_dir().unwrap_or_else(std::env::temp_dir);- path.push("moviebox-tui");+ path.push(crate::config::APP_NAME);path.push(namespace);path.push("images");let _ = fs::create_dir_all(&path);diff --git a/src/config.rs b/src/config.rsindex b08122f..f760f00 100644--- a/src/config.rs+++ b/src/config.rs@@ -34,12 +34,18 @@ impl Default for Config {}}+pub const APP_NAME: &str = "moviebox-tui";+fn path() -> Option<PathBuf> {- dirs::config_dir().map(|dir| dir.join("moviebox-tui").join("config.json"))+ dirs::config_dir().map(|dir| dir.join(APP_NAME).join("config.json"))}pub fn addons_path() -> Option<PathBuf> {- dirs::config_dir().map(|dir| dir.join("moviebox-tui").join("addons_config.json"))+ dirs::config_dir().map(|dir| dir.join(APP_NAME).join("addons_config.json"))+}++pub fn tv_path() -> Option<PathBuf> {+ dirs::config_dir().map(|dir| dir.join(APP_NAME).join("tv_config.json"))}pub fn load() -> Config {diff --git a/src/download.rs b/src/download.rsindex fd5aa92..3803569 100644--- a/src/download.rs+++ b/src/download.rs@@ -17,6 +17,7 @@ use tokio::io::AsyncWriteExt;const MAX_ATTEMPTS: usize = 4;const SEGMENT_THRESHOLD: u64 = 32 * 1024 * 1024;const MAX_SEGMENTS: usize = 8;+pub const DEFAULT_STREAM_NAME: &str = "MovieBox-Tui_Stream";pub fn safe_file_stem(value: &str) -> String {let mut stem = value@@ -24,7 +25,6 @@ pub fn safe_file_stem(value: &str) -> String {.take(120).map(|character| {if character.is_control()- || character.is_whitespace()|| matches!(character,'/' | '\\' | ':' | '*' | '?' | '"' | '<' | '>' | '|'@@ -38,7 +38,7 @@ pub fn safe_file_stem(value: &str) -> String {.collect::<String>();stem = stem.trim_matches(['.', ' ', '_']).to_string();if stem.is_empty() {- return "MovieBox-Tui_Stream".into();+ return DEFAULT_STREAM_NAME.into();}let upper = stem.to_ascii_uppercase();let reserved = matches!(upper.as_str(), "CON" | "PRN" | "AUX" | "NUL")diff --git a/src/history.rs b/src/history.rsindex 56948b4..6419b6a 100644--- a/src/history.rs+++ b/src/history.rs@@ -42,7 +42,7 @@ impl HistoryManager {fn history_file_path() -> Option<PathBuf> {let mut path = dirs::data_dir()?;- path.push("moviebox-tui");+ path.push(crate::config::APP_NAME);if !path.exists() {let _ = fs::create_dir_all(&path);}diff --git a/src/logging.rs b/src/logging.rsindex f028b42..bd43ca1 100644--- a/src/logging.rs+++ b/src/logging.rs@@ -12,7 +12,7 @@ pub fn init() {.unwrap_or_else(|| default_level.to_string());let log_dir = dirs::data_dir()- .map(|dir| dir.join("moviebox-tui").join("logs"))+ .map(|dir| dir.join(crate::config::APP_NAME).join("logs")).unwrap_or_else(std::env::temp_dir);match Logger::try_with_str(&spec) {@@ -21,7 +21,7 @@ pub fn init() {.log_to_file(FileSpec::default().directory(&log_dir)- .basename("moviebox-tui"),+ .basename(crate::config::APP_NAME),).rotate(Criterion::Size(5 * 1024 * 1024),@@ -32,16 +32,20 @@ pub fn init() {.format(flexi_logger::opt_format).start(){- eprintln!("[moviebox-tui] logging unavailable: {error}");+ eprintln!("[{}] logging unavailable: {error}", crate::config::APP_NAME);}}Err(error) => {- eprintln!("[moviebox-tui] invalid MOVIEBOX_LOG level: {error}");+ eprintln!(+ "[{}] invalid MOVIEBOX_LOG level: {error}",+ crate::config::APP_NAME+ );}}log::info!(- "session started | moviebox-tui {} | {} | log file: {}",+ "session started | {} {} | {} | log file: {}",+ crate::config::APP_NAME,env!("CARGO_PKG_VERSION"),std::env::consts::OS,display_path()@@ -51,9 +55,9 @@ pub fn init() {pub fn log_file_path() -> std::path::PathBuf {dirs::data_dir().map(|dir| {- dir.join("moviebox-tui")+ dir.join(crate::config::APP_NAME).join("logs")- .join("moviebox-tui_rCURRENT.log")+ .join(format!("{}_rCURRENT.log", crate::config::APP_NAME))}).unwrap_or_else(std::env::temp_dir)}diff --git a/src/providers/tv/parser.rs b/src/providers/tv/parser.rsindex 6616651..1e514cc 100644--- a/src/providers/tv/parser.rs+++ b/src/providers/tv/parser.rs@@ -16,7 +16,7 @@ impl Default for M3UParser {impl M3UParser {pub fn new() -> Self {let mut cache_dir = dirs::cache_dir().unwrap_or_else(std::env::temp_dir);- cache_dir.push("moviebox-tui");+ cache_dir.push(crate::config::APP_NAME);cache_dir.push("tv_playlists");std::fs::create_dir_all(&cache_dir).ok();let client = reqwest::Client::builder()diff --git a/src/tui/app/addons.rs b/src/tui/app/addons.rsindex cd94f5d..d7347e6 100644--- a/src/tui/app/addons.rs+++ b/src/tui/app/addons.rs@@ -22,12 +22,11 @@ impl App {if self.state.installed_addons.is_empty() {self.action_sender.send(Action::ShowAddonManager).ok();} else {- self.state.set_status("Addon mode active.".to_string(), 150);+ self.announce_mode();}} else if self.state.is_tv_mode {self.state.active_provider = crate::providers::models::ProviderKind::MovieBox;- self.state- .set_status("Loading TV playlists...".to_string(), 200);+ self.announce_mode();self.load_tv_playlists_from_config();self.reload_tv_playlists();if self.state.tv_playlists.is_empty() {@@ -35,13 +34,7 @@ impl App {}} else {self.state.active_provider = crate::providers::models::ProviderKind::MovieBox;- self.state.set_status(- format!(- "Streaming mode active ({}).",- self.state.active_provider.label()- ),- 150,- );+ self.announce_mode();}self.persist_config();}@@ -52,13 +45,7 @@ impl App {if self.state.active_provider == crate::providers::models::ProviderKind::Addons {self.state.active_provider = crate::providers::models::ProviderKind::MovieBox;}- self.state.set_status(- format!(- "Streaming mode active ({}).",- self.state.active_provider.label()- ),- 150,- );+ self.announce_mode();self.persist_config();}diff --git a/src/tui/app/download.rs b/src/tui/app/download.rsindex 3fb35bc..7546d51 100644--- a/src/tui/app/download.rs+++ b/src/tui/app/download.rs@@ -39,7 +39,7 @@ impl App {.as_ref().and_then(|details| details.get("title")).and_then(|title| title.as_str())- .unwrap_or("MovieBox-Tui_Stream");+ .unwrap_or(crate::download::DEFAULT_STREAM_NAME);let clean_title = crate::providers::moviebox::clean_moviebox_title(raw_title);let is_series = self.state@@ -62,7 +62,7 @@ impl App {.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()+ crate::download::DEFAULT_STREAM_NAME.to_string()} else {safe_title};@@ -442,7 +442,7 @@ impl App {.as_ref().and_then(|details| details.get("title")).and_then(|title| title.as_str())- .unwrap_or("MovieBox-Tui_Stream");+ .unwrap_or(crate::download::DEFAULT_STREAM_NAME);let clean_title = crate::providers::moviebox::clean_moviebox_title(raw_title);let safe_title = clean_title.chars()@@ -456,7 +456,7 @@ impl App {.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()+ crate::download::DEFAULT_STREAM_NAME.to_string()} else {safe_title};diff --git a/src/tui/app/mod.rs b/src/tui/app/mod.rsindex 25099a3..e4e2288 100644--- a/src/tui/app/mod.rs+++ b/src/tui/app/mod.rs@@ -51,13 +51,6 @@ impl App {if !state.streaming_enabled && !state.tv_enabled && !state.addons_enabled {state.streaming_enabled = true;}- if !state.streaming_enabled {- if state.tv_enabled {- state.is_tv_mode = true;- } else if state.addons_enabled {- state.is_addon_mode = true;- }- }let provider_was_sanitized = !state.bdix_enabled && config.active_provider.is_bdix();state.active_provider = if provider_was_sanitized {crate::providers::models::ProviderKind::MovieBox@@ -179,46 +172,41 @@ impl App {}fn save_tv_playlists(&self) {- if let Some(config_dir) = dirs::config_dir() {- let app_dir = config_dir.join("moviebox-tui");- let _ = std::fs::create_dir_all(&app_dir);- let path = app_dir.join("tv_config.json");- if let Ok(json) = serde_json::to_string(&self.state.tv_playlists) {- let temporary = path.with_extension(format!("{}.tmp", std::process::id()));- if let Err(error) = std::fs::write(&temporary, json) {- log::warn!("failed to save tv playlists: {error}");- return;- }- if std::fs::rename(&temporary, &path).is_err() {- let _ = std::fs::remove_file(&path);- if let Err(error) = std::fs::rename(&temporary, &path) {- let _ = std::fs::remove_file(&temporary);- log::warn!("failed to commit tv playlists: {error}");- }- }- }+ let Some(path) = crate::config::tv_path() else {+ return;+ };+ if let Some(app_dir) = path.parent()+ && std::fs::create_dir_all(app_dir).is_err()+ {+ return;+ }+ let Ok(json) = serde_json::to_string_pretty(&self.state.tv_playlists) else {+ return;+ };+ if let Err(error) = crate::cache::atomic_write_file(&path, json.as_bytes()) {+ log::warn!("failed to save tv playlists: {error}");}}fn load_tv_playlists_from_config(&mut self) {self.state.tv_playlists.clear();- if let Some(config_dir) = dirs::config_dir() {- let path = config_dir.join("moviebox-tui").join("tv_config.json");- if let Ok(content) = std::fs::read_to_string(&path)- && let Ok(list) = serde_json::from_str::<Vec<String>>(&content)- {- let mut seen = std::collections::HashSet::new();- self.state.tv_playlists = list- .into_iter()- .map(|item| item.trim().to_string())- .filter(|item| !item.is_empty() && seen.insert(item.clone()))- .collect();- if self.state.tv_playlists.is_empty() {- let _ = std::fs::remove_file(path);- }- } else {+ let Some(path) = crate::config::tv_path() else {+ return;+ };+ if let Ok(content) = std::fs::read_to_string(&path)+ && let Ok(list) = serde_json::from_str::<Vec<String>>(&content)+ {+ let mut seen = std::collections::HashSet::new();+ self.state.tv_playlists = list+ .into_iter()+ .map(|item| item.trim().to_string())+ .filter(|item| !item.is_empty() && seen.insert(item.clone()))+ .collect();+ if self.state.tv_playlists.is_empty() {let _ = std::fs::remove_file(path);}+ } else if path.exists() {+ let _ = std::fs::remove_file(path);}}diff --git a/src/tui/app/mouse.rs b/src/tui/app/mouse.rsindex 15d1734..96cdd00 100644--- a/src/tui/app/mouse.rs+++ b/src/tui/app/mouse.rs@@ -88,7 +88,7 @@ impl App {}if self.state.update_available.is_some() {- let popup = centered_rect(area, 46, 7, 36, 60);+ let popup = crate::tui::overlay::centered(area, 46, 7, 36, 60);if popup.contains(ratatui::layout::Position::new(col, row)) {let dismiss_y = popup.y + popup.height.saturating_sub(2);if row == dismiss_y {@@ -140,7 +140,7 @@ impl App {}if self.state.show_season_download_confirm {- let popup = centered_rect(area, 40, 6, 36, 64);+ let popup = crate::tui::overlay::centered(area, 40, 6, 36, 64);if popup.contains(ratatui::layout::Position::new(col, row)) {let action_y = popup.y + 3;if row == action_y {@@ -158,7 +158,7 @@ impl App {}if self.state.show_episode_download_confirm {- let popup = centered_rect(area, 40, 6, 36, 64);+ let popup = crate::tui::overlay::centered(area, 40, 6, 36, 64);if popup.contains(ratatui::layout::Position::new(col, row)) {let action_y = popup.y + 3;if row == action_y {@@ -197,7 +197,7 @@ impl App {total_rows.min(10).saturating_add(5) as u16,)};- let popup = centered_rect(area, popup_width, popup_height, 36, 70);+ let popup = crate::tui::overlay::centered(area, popup_width, popup_height, 36, 70);if popup.contains(ratatui::layout::Position::new(col, row)) {if !self.state.tv_input_active {let item_start_y = popup.y + 1;@@ -241,7 +241,7 @@ impl App {.min(area.height.saturating_sub(4)).max(7)};- let popup = centered_rect(area, popup_width, popup_height, 36, 80);+ let popup = crate::tui::overlay::centered(area, popup_width, popup_height, 36, 80);if popup.contains(ratatui::layout::Position::new(col, row)) {if !self.state.addon_input_active {let list_start_y = popup.y + 1;@@ -815,17 +815,6 @@ impl App {}}-fn centered_rect(area: Rect, width: u16, height: u16, min_w: u16, max_w: u16) -> Rect {- let w = width.clamp(min_w, max_w).min(area.width.saturating_sub(2));- let h = height.min(area.height.saturating_sub(2));- Rect {- x: area.x + (area.width.saturating_sub(w)) / 2,- y: area.y + (area.height.saturating_sub(h)) / 2,- width: w,- height: h,- }-}-fn centered_width_rect(area: Rect, width: u16) -> Rect {let w = width.min(area.width);Rect {@@ -845,7 +834,8 @@ fn hit_test_centered_picker(min_w: u16,max_w: u16,) -> Option<Option<usize>> {- let popup = centered_rect(area, width_pct, total_items as u16 + 4, min_w, max_w);+ let popup =+ crate::tui::overlay::centered(area, width_pct, total_items as u16 + 4, min_w, max_w);if popup.contains(ratatui::layout::Position::new(col, row)) {let item_y = popup.y.saturating_add(1);if row >= item_y && (row - item_y) < total_items as u16 {diff --git a/src/tui/app/run.rs b/src/tui/app/run.rsindex 464ccd1..67f96ec 100644--- a/src/tui/app/run.rs+++ b/src/tui/app/run.rs@@ -407,7 +407,7 @@ impl App {if let Some((version, notes)) = &self.state.update_available {use ratatui::layout::Alignment;use ratatui::text::{Line, Span};- use ratatui::widgets::{Block, BorderType, Borders, Paragraph};+ use ratatui::widgets::{Block, Borders, Paragraph};let note_lines: Vec<&str> = notes.lines()@@ -525,11 +525,7 @@ impl App {.title_alignment(Alignment::Center).title_style(self.theme.title).borders(Borders::ALL)- .border_type(if self.state.basic_terminal {- BorderType::Plain- } else {- BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(self.state.basic_terminal)).border_style(self.theme.border_focus);let popup = Paragraph::new(text).block(block);diff --git a/src/tui/app/tv.rs b/src/tui/app/tv.rsindex e94a7e4..d1129f7 100644--- a/src/tui/app/tv.rs+++ b/src/tui/app/tv.rs@@ -42,6 +42,27 @@ impl App {self.state.clear_details_state();}+ pub(super) fn announce_mode(&mut self) {+ match self.state.mode() {+ crate::tui::state::AppMode::Streaming => {+ self.state.set_status(+ format!(+ "Streaming mode active ({}).",+ self.state.active_provider.label()+ ),+ 150,+ );+ }+ crate::tui::state::AppMode::Tv => {+ self.state+ .set_status("Loading TV playlists...".to_string(), 200);+ }+ crate::tui::state::AppMode::Addon => {+ self.state.set_status("Addon mode active.".to_string(), 150);+ }+ }+ }+pub(super) async fn handle_tv(&mut self, action: Action) -> Option<()> {match action {Action::ToggleTvMode => {@@ -57,8 +78,7 @@ impl App {if self.state.is_tv_mode {self.state.tv_config_popup = false;self.state.tv_channels.clear();- self.state- .set_status("Loading TV playlists...".to_string(), 200);+ self.announce_mode();self.load_tv_playlists_from_config();self.reload_tv_playlists();if self.state.tv_playlists.is_empty() {@@ -72,7 +92,7 @@ impl App {if self.state.installed_addons.is_empty() {self.action_sender.send(Action::ShowAddonManager).ok();} else {- self.state.set_status("Addon mode active.".to_string(), 150);+ self.announce_mode();}} else {self.state.tv_config_popup = false;@@ -83,13 +103,7 @@ impl App {self.state.active_provider =crate::providers::models::ProviderKind::MovieBox;}- self.state.set_status(- format!(- "Streaming mode active ({}).",- self.state.active_provider.label()- ),- 150,- );+ self.announce_mode();}self.persist_config();}diff --git a/src/tui/overlay.rs b/src/tui/overlay.rsindex 0a42955..f42939d 100644--- a/src/tui/overlay.rs+++ b/src/tui/overlay.rs@@ -63,11 +63,7 @@ pub fn picker(.title(title).title_style(theme.title).borders(Borders::ALL)- .border_type(if basic_terminal {- BorderType::Plain- } else {- BorderType::Rounded- })+ .border_type(border_type(basic_terminal)).border_style(theme.lavender);let inner = block.inner(popup);frame.render_widget(block, popup);@@ -146,11 +142,7 @@ pub fn confirmation(.title(format!(" {title} ")).title_style(theme.title).borders(Borders::ALL)- .border_type(if basic_terminal {- BorderType::Plain- } else {- BorderType::Rounded- })+ .border_type(border_type(basic_terminal)).border_style(theme.lavender);let inner = block.inner(popup);frame.render_widget(block, popup);@@ -289,11 +281,7 @@ pub fn notifications(badge_style.add_modifier(Modifier::BOLD),)])).borders(Borders::ALL)- .border_type(if basic_terminal {- BorderType::Plain- } else {- BorderType::Rounded- })+ .border_type(border_type(basic_terminal)).border_style(badge_style).padding(ratatui::widgets::Padding::horizontal(1));@@ -346,6 +334,14 @@ pub fn clear_modal_area(frame: &mut Frame, bounds: Rect, popup: Rect, theme: &Th);}+pub fn border_type(basic_terminal: bool) -> BorderType {+ if basic_terminal {+ BorderType::Plain+ } else {+ BorderType::Rounded+ }+}+pub(crate) fn key_hint(key: &str, action: &str, theme: &Theme) -> Span<'static> {Span::styled(format!("[{key}] {action}"), theme.text_dim)}diff --git a/src/tui/screens/details.rs b/src/tui/screens/details.rsindex 5c3cfd0..0048e1c 100644--- a/src/tui/screens/details.rs+++ b/src/tui/screens/details.rs@@ -237,11 +237,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)let details_block = Block::default().borders(Borders::ALL)- .border_type(if state.basic_terminal {- ratatui::widgets::BorderType::Plain- } else {- ratatui::widgets::BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).border_style(theme.surface1).padding(ratatui::widgets::Padding::new(if matches!(tier, DetailsLayoutTier::Wide) {@@ -550,11 +546,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).block(Block::default().borders(Borders::ALL)- .border_type(if state.basic_terminal {- ratatui::widgets::BorderType::Plain- } else {- ratatui::widgets::BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).title(pane_title("Audio",language_count,@@ -610,11 +602,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).block(Block::default().borders(Borders::ALL)- .border_type(if state.basic_terminal {- ratatui::widgets::BorderType::Plain- } else {- ratatui::widgets::BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).title(pane_title("Seasons",state.available_seasons.len(),@@ -687,11 +675,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).block(Block::default().borders(Borders::ALL)- .border_type(if state.basic_terminal {- ratatui::widgets::BorderType::Plain- } else {- ratatui::widgets::BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).title(pane_title("Episodes",episode_count,@@ -762,11 +746,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)let streams_block = Block::default().borders(Borders::ALL)- .border_type(if state.basic_terminal {- ratatui::widgets::BorderType::Plain- } else {- ratatui::widgets::BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).title(ratatui::text::Line::from(streams_title).alignment(Alignment::Left)).title_style(if streams_focused {focused_title_style(theme)diff --git a/src/tui/screens/help.rs b/src/tui/screens/help.rsindex 5219c90..28ef74a 100644--- a/src/tui/screens/help.rs+++ b/src/tui/screens/help.rs@@ -3,7 +3,7 @@ use ratatui::{Frame,layout::{Alignment, Rect},text::{Line, Span},- widgets::{Block, BorderType, Borders, Paragraph},+ widgets::{Block, Borders, Paragraph},};pub fn draw(frame: &mut Frame, area: Rect, state: &AppState, theme: &Theme) {@@ -242,11 +242,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &AppState, theme: &Theme) {.title_alignment(Alignment::Center).title_style(theme.title).borders(Borders::ALL)- .border_type(if state.basic_terminal {- BorderType::Plain- } else {- BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).border_style(theme.border_focus);if two_columns {diff --git a/src/tui/screens/home.rs b/src/tui/screens/home.rsindex d8926e2..85fae8a 100644--- a/src/tui/screens/home.rs+++ b/src/tui/screens/home.rs@@ -943,11 +943,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).title(title).title_style(theme.title).borders(ratatui::widgets::Borders::ALL)- .border_type(if state.basic_terminal {- ratatui::widgets::BorderType::Plain- } else {- ratatui::widgets::BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).border_style(theme.lavender);let inner_area = popup_block.inner(popup_area);@@ -1098,11 +1094,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme).title(title).title_style(theme.title).borders(ratatui::widgets::Borders::ALL)- .border_type(if state.basic_terminal {- ratatui::widgets::BorderType::Plain- } else {- ratatui::widgets::BorderType::Rounded- })+ .border_type(crate::tui::overlay::border_type(state.basic_terminal)).border_style(theme.lavender);let inner_area = popup_block.inner(popup_area);