Skip to content

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

fix: termux player launch and am intent

Samir Hossainsdbac368d8db7
diff --git a/src/tui/app.rs b/src/tui/app.rs
index aa560ba..3d5ba32 100644
--- a/src/tui/app.rs
+++ b/src/tui/app.rs
@@ -202,6 +202,7 @@ impl App {
let mut command =
crate::tui::player::command(kind, &link, local_subtitle.as_deref(), &headers);
+ command.stdin(std::process::Stdio::null());
command.stdout(std::process::Stdio::null());
command.stderr(std::process::Stdio::null());
@@ -3361,6 +3362,7 @@ impl App {
"Preparing playback",
"Resolving the selected mirror.",
);
+ let default_player = self.state.available_players.first().copied();
let client = if release.provider == ProviderKind::BdixCircleFtp {
let sender_clone = self.action_sender.clone();
let source = crate::providers::models::PlaybackSource::bare(
@@ -3368,14 +3370,11 @@ impl App {
release.mirrors[0].resolver_url.clone(),
None,
);
- if open_with {
+ if open_with || default_player.is_none() {
sender_clone.send(Action::ShowPlaybackPicker(source)).ok();
- } else {
+ } else if let Some(player) = default_player {
sender_clone
- .send(Action::LaunchPlayback(
- crate::tui::state::PlayerKind::Mpv,
- source,
- ))
+ .send(Action::LaunchPlayback(player, source))
.ok();
}
return None;
@@ -3385,16 +3384,12 @@ impl App {
let sender = self.action_sender.clone();
tokio::spawn(async move {
match client.resolve_release(&release).await {
- Ok(source) if open_with => {
- sender.send(Action::ShowPlaybackPicker(source)).ok();
- }
Ok(source) => {
- sender
- .send(Action::LaunchPlayback(
- crate::tui::state::PlayerKind::Mpv,
- source,
- ))
- .ok();
+ if open_with || default_player.is_none() {
+ sender.send(Action::ShowPlaybackPicker(source)).ok();
+ } else if let Some(player) = default_player {
+ sender.send(Action::LaunchPlayback(player, source)).ok();
+ }
}
Err(error) => {
sender
diff --git a/src/tui/player.rs b/src/tui/player.rs
index b055123..7cf84f7 100644
--- a/src/tui/player.rs
+++ b/src/tui/player.rs
@@ -10,24 +10,20 @@ const VLC_MACOS: &str = "/Applications/VLC.app/Contents/MacOS/VLC";
pub fn detect() -> Vec<PlayerKind> {
let mut players = Vec::new();
- #[cfg(target_os = "android")]
- {
- players.push(PlayerKind::AndroidIntent);
+ #[cfg(target_os = "macos")]
+ if iina_available() {
+ players.push(PlayerKind::Iina);
}
- #[cfg(not(target_os = "android"))]
- {
- #[cfg(target_os = "macos")]
- if iina_available() {
- players.push(PlayerKind::Iina);
- }
+ if mpv_executable().is_some() {
+ players.push(PlayerKind::Mpv);
+ }
+ if vlc_executable().is_some() {
+ players.push(PlayerKind::Vlc);
+ }
- if mpv_executable().is_some() {
- players.push(PlayerKind::Mpv);
- }
- if vlc_executable().is_some() {
- players.push(PlayerKind::Vlc);
- }
+ if cfg!(target_os = "android") || std::path::Path::new("/system/bin/am").exists() {
+ players.push(PlayerKind::AndroidIntent);
}
players
@@ -58,15 +54,32 @@ pub fn command(
}
fn android_intent_command(url: &str) -> Command {
- let mut command = Command::new("am");
- command
- .arg("start")
- .arg("-a")
- .arg("android.intent.action.VIEW")
- .arg("-d")
- .arg(url)
- .arg("-t")
- .arg("video/*");
+ let mut command;
+ if command_exists("termux-open") {
+ command = Command::new("termux-open");
+ command.arg("--content-type").arg("video/*").arg(url);
+ } else {
+ command = Command::new("am");
+ command
+ .arg("start")
+ .arg("--user")
+ .arg("0")
+ .arg("-a")
+ .arg("android.intent.action.VIEW")
+ .arg("-d")
+ .arg(url)
+ .arg("-t")
+ .arg("video/*");
+
+ if cfg!(target_os = "android")
+ || std::env::var("PREFIX")
+ .unwrap_or_default()
+ .contains("com.termux")
+ {
+ command.env_remove("LD_LIBRARY_PATH");
+ command.env_remove("LD_PRELOAD");
+ }
+ }
command
}