Skip to content

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

feat(tui): make streaming, tv, and addon modes configurable

Samir Hossainscc8bafa70ae5
diff --git a/src/config.rs b/src/config.rs
index e3bf99c..465018d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -8,6 +8,8 @@ pub struct Config {
pub active_provider: ProviderKind,
pub active_theme: String,
pub bdix_enabled: bool,
+ pub streaming_enabled: bool,
+ pub tv_enabled: bool,
pub addons_enabled: bool,
pub default_player: Option<String>,
pub download_dir: Option<String>,
@@ -21,6 +23,8 @@ impl Default for Config {
active_provider: ProviderKind::MovieBox,
active_theme: String::new(),
bdix_enabled: false,
+ streaming_enabled: true,
+ tv_enabled: true,
addons_enabled: false,
default_player: None,
download_dir: None,
@@ -63,6 +67,12 @@ pub fn load() -> Config {
if let Some(v) = value.get("bdix_enabled").and_then(|v| v.as_bool()) {
config.bdix_enabled = v;
}
+ if let Some(v) = value.get("streaming_enabled").and_then(|v| v.as_bool()) {
+ config.streaming_enabled = v;
+ }
+ if let Some(v) = value.get("tv_enabled").and_then(|v| v.as_bool()) {
+ config.tv_enabled = v;
+ }
if let Some(v) = value.get("addons_enabled").and_then(|v| v.as_bool()) {
config.addons_enabled = v;
}
@@ -90,6 +100,8 @@ pub fn save(config: &Config) {
"active_provider": config.active_provider.cache_key(),
"active_theme": config.active_theme,
"bdix_enabled": config.bdix_enabled,
+ "streaming_enabled": config.streaming_enabled,
+ "tv_enabled": config.tv_enabled,
"addons_enabled": config.addons_enabled,
"default_player": config.default_player,
"download_dir": config.download_dir
diff --git a/src/tui/app/keyboard.rs b/src/tui/app/keyboard.rs
index b3b2f3c..5f8d382 100644
--- a/src/tui/app/keyboard.rs
+++ b/src/tui/app/keyboard.rs
@@ -15,19 +15,34 @@ impl App {
return None;
}
if let KeyCode::Char('t') = key.code {
- self.action_sender.send(Action::ToggleTvMode).ok();
+ if self.state.tv_enabled {
+ self.action_sender.send(Action::ToggleTvMode).ok();
+ } else {
+ self.state.set_status(
+ "TV Mode is disabled. Use /enable-tv to enable.".to_string(),
+ 120,
+ );
+ }
return None;
}
if let KeyCode::Char('a') = key.code {
- if !self.state.addons_enabled {
- self.state.addons_enabled = true;
- self.persist_config();
+ if self.state.addons_enabled {
+ self.action_sender.send(Action::ToggleAddonMode).ok();
+ } else {
+ self.state.set_status(
+ "Addon Mode is disabled. Use /enable-addons to enable.".to_string(),
+ 120,
+ );
}
- self.action_sender.send(Action::ToggleAddonMode).ok();
return None;
}
if let KeyCode::Char('s') = key.code {
- if !self.state.is_tv_mode && !self.state.is_addon_mode {
+ if !self.state.streaming_enabled {
+ self.state.set_status(
+ "Streaming Mode is disabled. Use /enable-streaming to enable.".to_string(),
+ 120,
+ );
+ } else if !self.state.is_tv_mode && !self.state.is_addon_mode {
self.state
.set_status("Already in Streaming Mode.".to_string(), 120);
} else {
diff --git a/src/tui/app/mod.rs b/src/tui/app/mod.rs
index d66452b..eabf427 100644
--- a/src/tui/app/mod.rs
+++ b/src/tui/app/mod.rs
@@ -45,7 +45,19 @@ impl App {
state.auto_update = config.auto_update;
state.last_update_check = config.last_update_check;
state.bdix_enabled = config.bdix_enabled;
+ state.streaming_enabled = config.streaming_enabled;
+ state.tv_enabled = config.tv_enabled;
state.addons_enabled = config.addons_enabled;
+ 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
@@ -111,6 +123,8 @@ impl App {
active_provider: self.state.active_provider,
active_theme: self.state.active_theme_kind.clone(),
bdix_enabled: self.state.bdix_enabled,
+ streaming_enabled: self.state.streaming_enabled,
+ tv_enabled: self.state.tv_enabled,
addons_enabled: self.state.addons_enabled,
default_player: self.state.default_player.clone(),
download_dir: self
diff --git a/src/tui/app/mouse.rs b/src/tui/app/mouse.rs
index 207aef4..41df124 100644
--- a/src/tui/app/mouse.rs
+++ b/src/tui/app/mouse.rs
@@ -385,19 +385,23 @@ impl App {
let sep = 5_u16;
let is_streaming = !self.state.is_tv_mode && !self.state.is_addon_mode;
- let b1_len = if is_streaming {
- (1 + ctrl_p.len() + 2 + self.state.active_provider.label().chars().count()) as u16
- } else {
- (1 + ctrl_s.len() + 2 + 9) as u16
- };
- buttons.push((ModeBtn::Streaming, b1_len));
+ if self.state.streaming_enabled {
+ let b1_len = if is_streaming {
+ (1 + ctrl_p.len() + 2 + self.state.active_provider.label().chars().count()) as u16
+ } else {
+ (1 + ctrl_s.len() + 2 + 9) as u16
+ };
+ buttons.push((ModeBtn::Streaming, b1_len));
+ }
- let b2_len = if self.state.is_tv_mode {
- 6_u16
- } else {
- (1 + ctrl_t.len() + 2 + 2) as u16
- };
- buttons.push((ModeBtn::Tv, b2_len));
+ if self.state.tv_enabled {
+ let b2_len = if self.state.is_tv_mode {
+ 6_u16
+ } else {
+ (1 + ctrl_t.len() + 2 + 2) as u16
+ };
+ buttons.push((ModeBtn::Tv, b2_len));
+ }
if self.state.addons_enabled {
let b3_len = if self.state.is_addon_mode {
diff --git a/src/tui/app/search.rs b/src/tui/app/search.rs
index 35e956d..86228c7 100644
--- a/src/tui/app/search.rs
+++ b/src/tui/app/search.rs
@@ -360,6 +360,109 @@ impl App {
}
Some(true)
}
+ crate::tui::commands::ParsedCommand::EnableStreaming
+ | crate::tui::commands::ParsedCommand::DisableStreaming => {
+ let enable_req = parsed == crate::tui::commands::ParsedCommand::EnableStreaming;
+ if self.state.streaming_enabled == enable_req {
+ self.state.search_query.clear();
+ self.state.input_mode = InputMode::Normal;
+ self.state.notify(
+ NotificationKind::Info,
+ "Streaming Mode",
+ if enable_req {
+ "Already Enabled"
+ } else {
+ "Already Disabled"
+ },
+ );
+ return Some(true);
+ }
+ if !enable_req && !self.state.tv_enabled && !self.state.addons_enabled {
+ self.state.search_query.clear();
+ self.state.input_mode = InputMode::Normal;
+ self.state.notify(
+ NotificationKind::Warning,
+ "Streaming Mode",
+ "Cannot disable: at least one mode must remain active.",
+ );
+ return Some(true);
+ }
+
+ self.state.streaming_enabled = enable_req;
+ self.persist_config();
+ self.state.search_query.clear();
+ self.state.input_mode = InputMode::Normal;
+ self.state.notify(
+ NotificationKind::Info,
+ "Streaming Mode",
+ if self.state.streaming_enabled {
+ "Enabled"
+ } else {
+ "Disabled"
+ },
+ );
+ if !self.state.streaming_enabled
+ && !self.state.is_tv_mode
+ && !self.state.is_addon_mode
+ {
+ if self.state.tv_enabled {
+ self.action_sender.send(Action::ToggleTvMode).ok();
+ } else if self.state.addons_enabled {
+ self.action_sender.send(Action::ToggleAddonMode).ok();
+ }
+ }
+ Some(true)
+ }
+ crate::tui::commands::ParsedCommand::EnableTv
+ | crate::tui::commands::ParsedCommand::DisableTv => {
+ let enable_req = parsed == crate::tui::commands::ParsedCommand::EnableTv;
+ if self.state.tv_enabled == enable_req {
+ self.state.search_query.clear();
+ self.state.input_mode = InputMode::Normal;
+ self.state.notify(
+ NotificationKind::Info,
+ "TV Mode",
+ if enable_req {
+ "Already Enabled"
+ } else {
+ "Already Disabled"
+ },
+ );
+ return Some(true);
+ }
+ if !enable_req && !self.state.streaming_enabled && !self.state.addons_enabled {
+ self.state.search_query.clear();
+ self.state.input_mode = InputMode::Normal;
+ self.state.notify(
+ NotificationKind::Warning,
+ "TV Mode",
+ "Cannot disable: at least one mode must remain active.",
+ );
+ return Some(true);
+ }
+
+ self.state.tv_enabled = enable_req;
+ self.persist_config();
+ self.state.search_query.clear();
+ self.state.input_mode = InputMode::Normal;
+ self.state.notify(
+ NotificationKind::Info,
+ "TV Mode",
+ if self.state.tv_enabled {
+ "Enabled"
+ } else {
+ "Disabled"
+ },
+ );
+ if !self.state.tv_enabled && self.state.is_tv_mode {
+ if self.state.streaming_enabled {
+ self.action_sender.send(Action::SwitchToStreamingMode).ok();
+ } else if self.state.addons_enabled {
+ self.action_sender.send(Action::ToggleAddonMode).ok();
+ }
+ }
+ Some(true)
+ }
crate::tui::commands::ParsedCommand::EnableAddons
| crate::tui::commands::ParsedCommand::DisableAddons => {
let enable_req = parsed == crate::tui::commands::ParsedCommand::EnableAddons;
@@ -377,6 +480,16 @@ impl App {
);
return Some(true);
}
+ if !enable_req && !self.state.streaming_enabled && !self.state.tv_enabled {
+ self.state.search_query.clear();
+ self.state.input_mode = InputMode::Normal;
+ self.state.notify(
+ NotificationKind::Warning,
+ "Addon Mode",
+ "Cannot disable: at least one mode must remain active.",
+ );
+ return Some(true);
+ }
self.state.addons_enabled = enable_req;
self.persist_config();
@@ -386,13 +499,17 @@ impl App {
NotificationKind::Info,
"Addon Mode",
if self.state.addons_enabled {
- "Enabled (Press Ctrl+A to switch to Addon Mode)"
+ "Enabled"
} else {
"Disabled"
},
);
if !self.state.addons_enabled && self.state.is_addon_mode {
- self.action_sender.send(Action::SwitchToStreamingMode).ok();
+ if self.state.streaming_enabled {
+ self.action_sender.send(Action::SwitchToStreamingMode).ok();
+ } else if self.state.tv_enabled {
+ self.action_sender.send(Action::ToggleTvMode).ok();
+ }
}
Some(true)
}
diff --git a/src/tui/commands.rs b/src/tui/commands.rs
index 5e6b5c5..9a263c0 100644
--- a/src/tui/commands.rs
+++ b/src/tui/commands.rs
@@ -16,6 +16,10 @@ pub enum SlashCommand {
Github,
EnableBdix,
DisableBdix,
+ EnableStreaming,
+ DisableStreaming,
+ EnableTv,
+ DisableTv,
EnableAddons,
DisableAddons,
}
@@ -36,12 +40,16 @@ pub enum ParsedCommand<'a> {
Github,
EnableBdix,
DisableBdix,
+ EnableStreaming,
+ DisableStreaming,
+ EnableTv,
+ DisableTv,
EnableAddons,
DisableAddons,
}
impl SlashCommand {
- pub const ALL: [Self; 16] = [
+ pub const ALL: [Self; 20] = [
Self::Browse,
Self::History,
Self::List,
@@ -56,6 +64,10 @@ impl SlashCommand {
Self::Github,
Self::EnableBdix,
Self::DisableBdix,
+ Self::EnableStreaming,
+ Self::DisableStreaming,
+ Self::EnableTv,
+ Self::DisableTv,
Self::EnableAddons,
Self::DisableAddons,
];
@@ -76,6 +88,10 @@ impl SlashCommand {
Self::Github => "/github",
Self::EnableBdix => "/enable-bdix",
Self::DisableBdix => "/disable-bdix",
+ Self::EnableStreaming => "/enable-streaming",
+ Self::DisableStreaming => "/disable-streaming",
+ Self::EnableTv => "/enable-tv",
+ Self::DisableTv => "/disable-tv",
Self::EnableAddons => "/enable-addons",
Self::DisableAddons => "/disable-addons",
}
@@ -103,6 +119,10 @@ impl SlashCommand {
Self::Github => "Open project repository",
Self::EnableBdix => "Enable BDIX FTP sources",
Self::DisableBdix => "Disable BDIX FTP sources",
+ Self::EnableStreaming => "Enable Streaming mode navigation",
+ Self::DisableStreaming => "Disable Streaming mode navigation",
+ Self::EnableTv => "Enable TV mode navigation",
+ Self::DisableTv => "Disable TV mode navigation",
Self::EnableAddons => "Enable Addon mode navigation",
Self::DisableAddons => "Disable Addon mode navigation",
}
@@ -110,14 +130,30 @@ impl SlashCommand {
pub fn is_available(self, state: &AppState) -> bool {
match self {
- Self::Browse | Self::History => !state.is_tv_mode && !state.is_addon_mode,
- Self::List | Self::Config => state.is_tv_mode,
+ Self::Browse | Self::History => {
+ state.streaming_enabled && !state.is_tv_mode && !state.is_addon_mode
+ }
+ Self::List | Self::Config => state.tv_enabled && state.is_tv_mode,
Self::Reload => state.is_tv_mode,
- Self::Addons => state.is_addon_mode || (!state.is_tv_mode && state.addons_enabled),
- Self::EnableBdix => !state.is_tv_mode && !state.is_addon_mode && !state.bdix_enabled,
- Self::DisableBdix => !state.is_tv_mode && !state.is_addon_mode && state.bdix_enabled,
- Self::EnableAddons => !state.is_tv_mode && !state.addons_enabled,
- Self::DisableAddons => !state.is_tv_mode && state.addons_enabled,
+ Self::Addons => state.addons_enabled && (state.is_addon_mode || !state.is_tv_mode),
+ Self::EnableBdix => {
+ state.streaming_enabled
+ && !state.is_tv_mode
+ && !state.is_addon_mode
+ && !state.bdix_enabled
+ }
+ Self::DisableBdix => {
+ state.streaming_enabled
+ && !state.is_tv_mode
+ && !state.is_addon_mode
+ && state.bdix_enabled
+ }
+ Self::EnableStreaming => !state.streaming_enabled,
+ Self::DisableStreaming => state.streaming_enabled,
+ Self::EnableTv => !state.tv_enabled,
+ Self::DisableTv => state.tv_enabled,
+ Self::EnableAddons => !state.addons_enabled,
+ Self::DisableAddons => state.addons_enabled,
Self::DownloadDir
| Self::Theme
| Self::Update
@@ -176,6 +212,10 @@ impl SlashCommand {
"/github" => Some(ParsedCommand::Github),
"/enable-bdix" => Some(ParsedCommand::EnableBdix),
"/disable-bdix" => Some(ParsedCommand::DisableBdix),
+ "/enable-streaming" => Some(ParsedCommand::EnableStreaming),
+ "/disable-streaming" => Some(ParsedCommand::DisableStreaming),
+ "/enable-tv" => Some(ParsedCommand::EnableTv),
+ "/disable-tv" => Some(ParsedCommand::DisableTv),
"/enable-addons" => Some(ParsedCommand::EnableAddons),
"/disable-addons" => Some(ParsedCommand::DisableAddons),
_ => None,
diff --git a/src/tui/screens/help.rs b/src/tui/screens/help.rs
index 8881a17..1c8d0d4 100644
--- a/src/tui/screens/help.rs
+++ b/src/tui/screens/help.rs
@@ -15,23 +15,37 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &AppState, theme: &Theme) {
"Streaming Mode"
};
- let mut help_text: Vec<Line> = vec![
- Line::from(vec![Span::styled(
- " Mode Switching & Navigation",
- theme.header.add_modifier(ratatui::style::Modifier::BOLD),
- )]),
- Line::from(vec![
- Span::styled(" [Ctrl+S] ", theme.header),
+ let mut help_text: Vec<Line> = vec![Line::from(vec![Span::styled(
+ " Mode Switching & Navigation",
+ theme.header.add_modifier(ratatui::style::Modifier::BOLD),
+ )])];
+
+ if state.streaming_enabled {
+ let key = format!(" [{}]", crate::tui::text::ctrl_key("S"));
+ let padded = format!("{:<19}", key);
+ help_text.push(Line::from(vec![
+ Span::styled(padded, theme.header),
Span::styled("Switch to Streaming Mode", theme.text),
- ]),
- Line::from(vec![
- Span::styled(" [Ctrl+T] ", theme.header),
+ ]));
+ }
+ if state.tv_enabled {
+ let key = format!(" [{}]", crate::tui::text::ctrl_key("T"));
+ let padded = format!("{:<19}", key);
+ help_text.push(Line::from(vec![
+ Span::styled(padded, theme.header),
Span::styled("Switch to TV Mode", theme.text),
- ]),
- Line::from(vec![
- Span::styled(" [Ctrl+A] ", theme.header),
+ ]));
+ }
+ if state.addons_enabled {
+ let key = format!(" [{}]", crate::tui::text::ctrl_key("A"));
+ let padded = format!("{:<19}", key);
+ help_text.push(Line::from(vec![
+ Span::styled(padded, theme.header),
Span::styled("Switch to Addon Mode", theme.text),
- ]),
+ ]));
+ }
+
+ help_text.extend(vec![
Line::from(vec![
Span::styled(" [↑] / [↓] ", theme.header),
Span::styled("Scroll Lists / Navigate", theme.text),
@@ -53,7 +67,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &AppState, theme: &Theme) {
Span::styled("Quit Application", theme.text),
]),
Line::from(vec![]),
- ];
+ ]);
if state.is_tv_mode {
help_text.push(Line::from(vec![Span::styled(
diff --git a/src/tui/screens/home.rs b/src/tui/screens/home.rs
index d84e6ec..1a5f17a 100644
--- a/src/tui/screens/home.rs
+++ b/src/tui/screens/home.rs
@@ -376,53 +376,69 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)
let ctrl_a = crate::tui::text::ctrl_key("A");
let ctrl_p = crate::tui::text::ctrl_key("P");
- let mut mode_spans = vec![];
- if !state.is_tv_mode && !state.is_addon_mode {
- mode_spans.push(Span::styled("[", theme.text_dim));
- mode_spans.push(Span::styled(&ctrl_p, theme.shortcut));
- mode_spans.push(Span::styled("] ", theme.text_dim));
- mode_spans.push(Span::styled(
- state.active_provider.label(),
- theme.highlight.add_modifier(Modifier::BOLD),
- ));
- } else {
- mode_spans.push(Span::styled("[", theme.text_dim));
- mode_spans.push(Span::styled(&ctrl_s, theme.shortcut));
- mode_spans.push(Span::styled("] ", theme.text_dim));
- mode_spans.push(Span::styled("Streaming", theme.text_dim));
+ let mut mode_tabs: Vec<Vec<Span>> = Vec::new();
+
+ if state.streaming_enabled {
+ let mut spans = vec![];
+ if !state.is_tv_mode && !state.is_addon_mode {
+ spans.push(Span::styled("[", theme.text_dim));
+ spans.push(Span::styled(&ctrl_p, theme.shortcut));
+ spans.push(Span::styled("] ", theme.text_dim));
+ spans.push(Span::styled(
+ state.active_provider.label(),
+ theme.highlight.add_modifier(Modifier::BOLD),
+ ));
+ } else {
+ spans.push(Span::styled("[", theme.text_dim));
+ spans.push(Span::styled(&ctrl_s, theme.shortcut));
+ spans.push(Span::styled("] ", theme.text_dim));
+ spans.push(Span::styled("Streaming", theme.text_dim));
+ }
+ mode_tabs.push(spans);
}
- mode_spans.push(Span::raw(" "));
-
- if state.is_tv_mode {
- mode_spans.push(Span::styled("[ ", theme.text_dim));
- mode_spans.push(Span::styled(
- "TV",
- theme.highlight.add_modifier(Modifier::BOLD),
- ));
- mode_spans.push(Span::styled(" ]", theme.text_dim));
- } else {
- mode_spans.push(Span::styled("[", theme.text_dim));
- mode_spans.push(Span::styled(&ctrl_t, theme.shortcut));
- mode_spans.push(Span::styled("] ", theme.text_dim));
- mode_spans.push(Span::styled("TV", theme.text_dim));
+ if state.tv_enabled {
+ let mut spans = vec![];
+ if state.is_tv_mode {
+ spans.push(Span::styled("[ ", theme.text_dim));
+ spans.push(Span::styled(
+ "TV",
+ theme.highlight.add_modifier(Modifier::BOLD),
+ ));
+ spans.push(Span::styled(" ]", theme.text_dim));
+ } else {
+ spans.push(Span::styled("[", theme.text_dim));
+ spans.push(Span::styled(&ctrl_t, theme.shortcut));
+ spans.push(Span::styled("] ", theme.text_dim));
+ spans.push(Span::styled("TV", theme.text_dim));
+ }
+ mode_tabs.push(spans);
}
if state.addons_enabled {
- mode_spans.push(Span::raw(" "));
+ let mut spans = vec![];
if state.is_addon_mode {
- mode_spans.push(Span::styled("[ ", theme.text_dim));
- mode_spans.push(Span::styled(
+ spans.push(Span::styled("[ ", theme.text_dim));
+ spans.push(Span::styled(
"Addons",
theme.highlight.add_modifier(Modifier::BOLD),
));
- mode_spans.push(Span::styled(" ]", theme.text_dim));
+ spans.push(Span::styled(" ]", theme.text_dim));
} else {
- mode_spans.push(Span::styled("[", theme.text_dim));
- mode_spans.push(Span::styled(&ctrl_a, theme.shortcut));
- mode_spans.push(Span::styled("] ", theme.text_dim));
- mode_spans.push(Span::styled("Addons", theme.text_dim));
+ spans.push(Span::styled("[", theme.text_dim));
+ spans.push(Span::styled(&ctrl_a, theme.shortcut));
+ spans.push(Span::styled("] ", theme.text_dim));
+ spans.push(Span::styled("Addons", theme.text_dim));
+ }
+ mode_tabs.push(spans);
+ }
+
+ let mut mode_spans = vec![];
+ for (i, tab) in mode_tabs.into_iter().enumerate() {
+ if i > 0 {
+ mode_spans.push(Span::raw(" "));
}
+ mode_spans.extend(tab);
}
frame.render_widget(
diff --git a/src/tui/state.rs b/src/tui/state.rs
index 9b189c3..d57b19c 100644
--- a/src/tui/state.rs
+++ b/src/tui/state.rs
@@ -148,8 +148,10 @@ pub struct AppState {
pub pending_open_with: bool,
pub basic_terminal: bool,
pub bdix_enabled: bool,
+ pub streaming_enabled: bool,
pub is_tv_mode: bool,
+ pub tv_enabled: bool,
pub tv_config_popup: bool,
pub tv_channels: Vec<crate::providers::m3u::Channel>,
pub tv_playlists: Vec<String>,
@@ -280,7 +282,9 @@ impl Default for AppState {
pending_play_link: None,
pending_open_with: false,
bdix_enabled: false,
+ streaming_enabled: true,
is_tv_mode: false,
+ tv_enabled: true,
tv_config_popup: false,
tv_channels: Vec::new(),
tv_playlists: Vec::new(),