Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
feat: add Flatpak support for players, optimize event handling, and implement automated GitHub release workflows.
Samir Hossainse7057353f89f
diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlnew file mode 100644index 0000000..0aab4a0--- /dev/null+++ b/.github/workflows/release.yml@@ -0,0 +1,165 @@+name: Release++on:+ push:+ branches:+ - main+ paths:+ - "Cargo.toml"++permissions:+ contents: write++jobs:+ check-version:+ name: Check Version+ runs-on: ubuntu-latest+ outputs:+ version: ${{ steps.check.outputs.version }}+ is_new: ${{ steps.check.outputs.is_new }}+ steps:+ - uses: actions/checkout@v4+ - name: Get version from Cargo.toml+ id: check+ run: |+ VERSION=$(grep '^version =' Cargo.toml | head -1 | awk -F'"' '{print $2}')+ echo "version=$VERSION" >> $GITHUB_OUTPUT++ if gh release view "v$VERSION" &>/dev/null; then+ echo "is_new=false" >> $GITHUB_OUTPUT+ echo "Release v$VERSION already exists. Skipping build."+ else+ echo "is_new=true" >> $GITHUB_OUTPUT+ echo "New version v$VERSION detected."+ fi+ env:+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}++ build:+ name: Build ${{ matrix.target }}+ needs: check-version+ if: needs.check-version.outputs.is_new == 'true'+ runs-on: ${{ matrix.os }}+ strategy:+ fail-fast: false+ matrix:+ include:+ - target: x86_64-unknown-linux-gnu+ os: ubuntu-latest+ - target: aarch64-unknown-linux-gnu+ os: ubuntu-latest+ - target: x86_64-apple-darwin+ os: macos-latest+ - target: aarch64-apple-darwin+ os: macos-latest+ - target: x86_64-pc-windows-msvc+ os: windows-latest++ steps:+ - uses: actions/checkout@v4++ - name: Install cross-compilation tools+ if: matrix.os == 'ubuntu-latest' && matrix.target == 'aarch64-unknown-linux-gnu'+ run: sudo apt-get update && sudo apt-get install -y gcc-aarch64-linux-gnu libc6-dev-arm64-cross++ - name: Install Rust+ uses: dtolnay/rust-toolchain@stable+ with:+ targets: ${{ matrix.target }}++ - name: Build Binary+ run: |+ if [ "${{ matrix.target }}" == "aarch64-unknown-linux-gnu" ]; then+ export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc+ fi+ cargo build --release --target ${{ matrix.target }}+ shell: bash++ - name: Archive Unix+ if: matrix.os != 'windows-latest'+ run: |+ mkdir dist+ cp target/${{ matrix.target }}/release/moviebox-tui dist/+ cp README.md dist/+ cp LICENSE-* dist/ || true++ if [ "${{ matrix.target }}" == "x86_64-unknown-linux-gnu" ]; then+ tar -czvf MovieBox_Linux_x64.tar.gz -C dist .+ elif [ "${{ matrix.target }}" == "aarch64-unknown-linux-gnu" ]; then+ tar -czvf MovieBox_Linux_arm64.tar.gz -C dist .+ else+ tar -czvf moviebox-tui-${{ matrix.target }}.tar.gz -C dist .+ fi++ - name: Archive Windows+ if: matrix.os == 'windows-latest'+ run: |+ mkdir dist+ cp target\${{ matrix.target }}\release\moviebox-tui.exe dist\+ cp README.md dist\+ cp LICENSE-* dist\ || echo "No license files found"+ Compress-Archive -Path dist\* -DestinationPath MovieBox_Windows_x64.zip++ - name: Upload Artifact+ uses: actions/upload-artifact@v4+ with:+ name: binary-${{ matrix.target }}+ path: |+ *.tar.gz+ *.zip++ build-macos-universal:+ name: Build macOS Universal+ needs: [check-version, build]+ if: needs.check-version.outputs.is_new == 'true'+ runs-on: macos-latest+ steps:+ - uses: actions/checkout@v4++ - name: Download x86_64 artifact+ uses: actions/download-artifact@v4+ with:+ name: binary-x86_64-apple-darwin+ path: x86_64++ - name: Download aarch64 artifact+ uses: actions/download-artifact@v4+ with:+ name: binary-aarch64-apple-darwin+ path: aarch64++ - name: Create Universal Binary+ run: |+ mkdir -p universal/dist+ tar -xzf x86_64/moviebox-tui-x86_64-apple-darwin.tar.gz -C x86_64/+ tar -xzf aarch64/moviebox-tui-aarch64-apple-darwin.tar.gz -C aarch64/+ lipo -create -output universal/dist/moviebox-tui x86_64/moviebox-tui aarch64/moviebox-tui+ cp README.md universal/dist/+ cp LICENSE-* universal/dist/ || true+ cd universal/dist+ tar -czvf ../../MovieBox_macOS_Universal.tar.gz .++ - name: Upload Universal Artifact+ uses: actions/upload-artifact@v4+ with:+ name: binary-universal-apple-darwin+ path: MovieBox_macOS_Universal.tar.gz++ release:+ name: Create Release+ needs: [check-version, build, build-macos-universal]+ if: needs.check-version.outputs.is_new == 'true'+ runs-on: ubuntu-latest+ steps:+ - uses: actions/download-artifact@v4+ with:+ path: artifacts+ - name: Generate Release Notes and Publish+ uses: softprops/action-gh-release@v2+ with:+ tag_name: "v${{ needs.check-version.outputs.version }}"+ name: "MovieBox TUI v${{ needs.check-version.outputs.version }}"+ generate_release_notes: true+ files: |+ artifacts/**/*.tar.gz+ artifacts/**/*.zipdiff --git a/Cargo.lock b/Cargo.lockindex f5e634b..e0caa23 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1809,7 +1809,7 @@ dependencies = [[[package]]name = "moviebox-tui"-version = "0.1.7"+version = "0.1.8"dependencies = ["base64","crossterm",diff --git a/Cargo.toml b/Cargo.tomlindex 0c21c06..beda4fb 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -1,7 +1,7 @@[package]name = "moviebox-tui"exclude = ["assets/", ".github/", "scripts/", "install.sh", "install.ps1"]-version = "0.1.7"+version = "0.1.8"edition = "2024"description = "A terminal client for finding and streaming movies, TV shows, and anime from the MovieBox catalog."repository = "https://github.com/mesamirh/MovieBox-Tui"diff --git a/install.ps1 b/install.ps1index 4e3497b..5d8d29d 100644--- a/install.ps1+++ b/install.ps1@@ -6,7 +6,7 @@ function Write-Success { param([string]$Message) Write-Host "$Message" -Foregroufunction Write-Warn { param([string]$Message) Write-Host "WARNING: $Message" -ForegroundColor Yellow }function Write-Err { param([string]$Message) Write-Host "ERROR: $Message" -ForegroundColor Red; exit 1 }-$InstallDir = "$env:USERPROFILE\AppData\Local\MovieBox-Tui"+$InstallDir = "$env:LOCALAPPDATA\MovieBox-Tui"$ExePath = "$InstallDir\moviebox-tui.exe"$ZipFile = "$env:TEMP\MovieBox_Windows_x64.zip"diff --git a/src/download.rs b/src/download.rsindex d5027a5..fd5aa92 100644--- a/src/download.rs+++ b/src/download.rs@@ -250,8 +250,8 @@ wherereturn Ok(DownloadOutcome::Paused { bytes: downloaded });}- match response.chunk().await {- Ok(Some(chunk)) => {+ match tokio::time::timeout(Duration::from_secs(30), response.chunk()).await {+ Ok(Ok(Some(chunk))) => {file.write_all(&chunk).await?;downloaded += chunk.len() as u64;if last_report.elapsed() >= Duration::from_millis(200) {@@ -270,7 +270,7 @@ wherelast_report = Instant::now();}}- Ok(None) => {+ Ok(Ok(None)) => {file.flush().await?;file.sync_data().await?;if let Some(expected) = metadata.total@@ -297,11 +297,16 @@ wherefinalize(&partial, &metadata_path, destination).await?;return Ok(DownloadOutcome::Completed { bytes: downloaded });}- Err(error) => {+ Ok(Err(error)) => {file.flush().await?;last_error = Some(DownloadError::Network(error));break;}+ Err(_) => {+ file.flush().await?;+ last_error = Some(DownloadError::InvalidRange("read timeout".into()));+ break;+ }}}@@ -344,8 +349,7 @@ where}let downloaded = Arc::new(AtomicU64::new(initial));- let (progress_sender, mut progress_receiver) =- tokio::sync::mpsc::channel::<(u64, usize)>(64);+ let (progress_sender, mut progress_receiver) = tokio::sync::mpsc::channel::<(u64, usize)>(64);let mut tasks = tokio::task::JoinSet::new();let validator = metadata.etag.clone().or(metadata.last_modified.clone());@@ -533,8 +537,8 @@ async fn download_segment(file.flush().await?;return Err(DownloadError::Paused);}- match response.chunk().await {- Ok(Some(chunk)) => {+ match tokio::time::timeout(Duration::from_secs(30), response.chunk()).await {+ Ok(Ok(Some(chunk))) => {let remaining = expected - written;let bytes = chunk.len().min(remaining as usize);file.write_all(&chunk[..bytes]).await?;@@ -546,7 +550,7 @@ async fn download_segment(return Ok(());}}- Ok(None) => {+ Ok(Ok(None)) => {file.flush().await?;last_error = Some(DownloadError::Incomplete {downloaded: written,@@ -554,11 +558,16 @@ async fn download_segment(});break;}- Err(error) => {+ Ok(Err(error)) => {file.flush().await?;last_error = Some(DownloadError::Network(error));break;}+ Err(_) => {+ file.flush().await?;+ last_error = Some(DownloadError::InvalidRange("read timeout".into()));+ break;+ }}}retry_delay(attempt).await;diff --git a/src/main.rs b/src/main.rsindex 0402a0d..9412212 100644--- a/src/main.rs+++ b/src/main.rs@@ -19,6 +19,17 @@ impl Drop for TerminalGuard {#[tokio::main]async fn main() -> std::io::Result<()> {+ std::panic::set_hook(Box::new(|info| {+ let _ = crossterm::terminal::disable_raw_mode();+ let _ = crossterm::execute!(+ std::io::stdout(),+ crossterm::terminal::LeaveAlternateScreen,+ crossterm::event::DisableMouseCapture,+ crossterm::event::DisableFocusChange+ );+ eprintln!("{}", info);+ }));+let args: Vec<String> = std::env::args().collect();if args.iter()diff --git a/src/providers/moviebox/client.rs b/src/providers/moviebox/client.rsindex bebfbbf..786f1c1 100644--- a/src/providers/moviebox/client.rs+++ b/src/providers/moviebox/client.rs@@ -78,7 +78,11 @@ impl MovieBoxClient {let path = "/wefeed-mobile-bff/tab-operating?page=1&tabId=0&version=";let _ = self.get(path).await?;- let has_token = self.runtime_token.read().unwrap().is_some();+ let has_token = self+ .runtime_token+ .read()+ .unwrap_or_else(|e| e.into_inner())+ .is_some();if !has_token {return Err(ScraperError::MissingToken);}@@ -99,7 +103,10 @@ impl MovieBoxClient {return;};if !token.is_empty() {- let mut write_token = self.runtime_token.write().unwrap();+ let mut write_token = self+ .runtime_token+ .write()+ .unwrap_or_else(|e| e.into_inner());*write_token = Some(token.to_string());}}@@ -129,7 +136,11 @@ impl MovieBoxClient {let base = HOST_POOL[idx];let url = format!("{}{}", base, path_and_query);- let token = self.runtime_token.read().unwrap().clone();+ let token = self+ .runtime_token+ .read()+ .unwrap_or_else(|e| e.into_inner())+ .clone();let headers = build_signed_headers(method,&url,@@ -185,12 +196,12 @@ impl MovieBoxClient {};let body_val: Value =- match tokio::task::spawn_blocking(move || serde_json::from_str(&raw_text))- .await- .unwrap()- {- Ok(v) => v,- Err(e) => return Err(ScraperError::Json(e)),+ match tokio::task::spawn_blocking(move || serde_json::from_str(&raw_text)).await {+ Ok(Ok(v)) => v,+ Ok(Err(e)) => return Err(ScraperError::Json(e)),+ Err(_) => {+ return Err(ScraperError::HostsExhausted);+ }};if let Some(data) = body_val.get("data") {diff --git a/src/tui/app.rs b/src/tui/app.rsindex 42f04e6..bbb90cf 100644--- a/src/tui/app.rs+++ b/src/tui/app.rs@@ -437,6 +437,7 @@ impl App {.to_ascii_lowercase();let base_dir = dirs::download_dir()+ .or_else(|| dirs::home_dir().map(|h| h.join("Downloads"))).unwrap_or_else(|| std::path::PathBuf::from(".")).join("MovieBox-TUI");let (target_dir, base_name) = if media_type == 2 {@@ -3369,6 +3370,9 @@ impl App {let subject_id = self.state.active_subject_id.clone().unwrap_or_default();+ self.state.selected_resources = None;+ self.state.is_fetching_streams = true;+self.action_sender.send(Action::FetchEpisodeStreams {subject_id,@@ -4358,14 +4362,19 @@ impl App {use std::os::unix::process::CommandExt;cmd.process_group(0);}+ #[cfg(windows)]+ {+ use std::os::windows::process::CommandExt;+ cmd.creation_flags(0x08000000);+ }- let _ = cmd.spawn();-- if let Some(path) = sub_temp_path {- tokio::spawn(async move {- tokio::time::sleep(std::time::Duration::from_secs(5)).await;- let _ = tokio::fs::remove_file(path).await;- });+ if let Ok(mut child) = cmd.spawn() {+ if let Some(path) = sub_temp_path {+ tokio::task::spawn_blocking(move || {+ let _ = child.wait();+ let _ = std::fs::remove_file(path);+ });+ }}});}@@ -4416,11 +4425,18 @@ impl App {use std::os::unix::process::CommandExt;cmd.process_group(0);}- let _ = cmd.spawn();-- if let Some(path) = sub_temp_path {- tokio::time::sleep(std::time::Duration::from_secs(5)).await;- let _ = tokio::fs::remove_file(path).await;+ #[cfg(windows)]+ {+ use std::os::windows::process::CommandExt;+ cmd.creation_flags(0x08000000);+ }+ if let Ok(mut child) = cmd.spawn() {+ if let Some(path) = sub_temp_path {+ tokio::task::spawn_blocking(move || {+ let _ = child.wait();+ let _ = std::fs::remove_file(path);+ });+ }}});}diff --git a/src/tui/event.rs b/src/tui/event.rsindex 3773277..55edc0b 100644--- a/src/tui/event.rs+++ b/src/tui/event.rs@@ -29,26 +29,24 @@ impl EventHandler {match event {Ok(CrosstermEvent::Key(key)) => {let is_press = key.kind == KeyEventKind::Press;- if is_press && event_sender.send(Action::Key(key)).await.is_err() {- break;- }+ if is_press && event_sender.try_send(Action::Key(key)).is_err() {}}Ok(CrosstermEvent::Mouse(mouse)) => {match mouse.kind {crossterm::event::MouseEventKind::ScrollUp => {- let _ = event_sender.send(Action::Key(crossterm::event::KeyEvent::new(crossterm::event::KeyCode::Up, crossterm::event::KeyModifiers::empty()))).await;+ let _ = event_sender.try_send(Action::Key(crossterm::event::KeyEvent::new(crossterm::event::KeyCode::Up, crossterm::event::KeyModifiers::empty())));}crossterm::event::MouseEventKind::ScrollDown => {- let _ = event_sender.send(Action::Key(crossterm::event::KeyEvent::new(crossterm::event::KeyCode::Down, crossterm::event::KeyModifiers::empty()))).await;+ let _ = event_sender.try_send(Action::Key(crossterm::event::KeyEvent::new(crossterm::event::KeyCode::Down, crossterm::event::KeyModifiers::empty())));}_ => {}}}- Ok(CrosstermEvent::FocusGained) => {- let _ = event_sender.send(Action::FocusChange).await;+ Ok(CrosstermEvent::FocusGained) | Ok(CrosstermEvent::FocusLost) => {+ let _ = event_sender.try_send(Action::FocusChange);}- Ok(CrosstermEvent::Resize(w, h)) if event_sender.send(Action::Resize(w, h)).await.is_err() => {- break;+ Ok(CrosstermEvent::Resize(w, h)) => {+ let _ = event_sender.try_send(Action::Resize(w, h));}_ => {}}diff --git a/src/tui/player.rs b/src/tui/player.rsindex f3933ba..033034d 100644--- a/src/tui/player.rs+++ b/src/tui/player.rs@@ -54,7 +54,14 @@ fn mpv_command("mpv"};let executable = mpv_executable().unwrap_or_else(|| fallback.into());- let mut command = Command::new(executable);+ let mut command = if executable.starts_with("flatpak run ") {+ let mut parts = executable.split(' ');+ let mut cmd = Command::new(parts.next().unwrap());+ cmd.args(parts);+ cmd+ } else {+ Command::new(executable)+ };let prefix = if iina { "--mpv-" } else { "--" };command@@ -108,7 +115,14 @@ fn vlc_command(url: &str, subtitle: Option<&str>, headers: &[(String, String)])"vlc"};let executable = vlc_executable().unwrap_or_else(|| fallback.into());- let mut command = Command::new(executable);+ let mut command = if executable.starts_with("flatpak run ") {+ let mut parts = executable.split(' ');+ let mut cmd = Command::new(parts.next().unwrap());+ cmd.args(parts);+ cmd+ } else {+ Command::new(executable)+ };command.arg("--width=960").arg("--height=540").arg(url);for (name, value) in headers {@@ -132,6 +146,7 @@ fn mpv_executable() -> Option<String> {"mpv"};first_executable(&[MPV_WINDOWS, MPV_MACOS], fallback)+ .or_else(|| flatpak_executable("io.mpv.Mpv"))}fn vlc_executable() -> Option<String> {@@ -140,7 +155,40 @@ fn vlc_executable() -> Option<String> {} else {"vlc"};- first_executable(&[VLC_WINDOWS, VLC_WINDOWS_X86, VLC_MACOS], fallback)++ let paths = vec![VLC_WINDOWS, VLC_WINDOWS_X86, VLC_MACOS];++ #[cfg(windows)]+ let windows_app_path = std::env::var("LOCALAPPDATA")+ .map(|l| format!(r"{}\Microsoft\WindowsApps\vlc.exe", l))+ .unwrap_or_default();++ #[allow(unused_mut)]+ let mut static_paths: Vec<&str> = paths.clone();++ #[cfg(windows)]+ if !windows_app_path.is_empty() {+ static_paths.push(&windows_app_path);+ }++ first_executable(&static_paths, fallback).or_else(|| flatpak_executable("org.videolan.VLC"))+}++fn flatpak_executable(app_id: &str) -> Option<String> {+ if !cfg!(target_os = "linux") {+ return None;+ }+ if command_exists("flatpak") {+ let mut cmd = Command::new("flatpak");+ cmd.arg("info")+ .arg(app_id)+ .stdout(std::process::Stdio::null())+ .stderr(std::process::Stdio::null());+ if cmd.output().map(|o| o.status.success()).unwrap_or(false) {+ return Some(format!("flatpak run {}", app_id));+ }+ }+ None}fn first_executable(paths: &[&str], fallback: &str) -> Option<String> {@@ -152,13 +200,14 @@ fn first_executable(paths: &[&str], fallback: &str) -> Option<String> {}fn command_exists(command: &str) -> bool {- let finder = if cfg!(target_os = "windows") {- "where"- } else {- "which"- };- Command::new(finder)- .arg(command)- .output()- .is_ok_and(|output| output.status.success())+ let mut cmd = Command::new(command);+ cmd.arg("--version")+ .stdout(std::process::Stdio::null())+ .stderr(std::process::Stdio::null());+ #[cfg(windows)]+ {+ use std::os::windows::process::CommandExt;+ cmd.creation_flags(0x08000000);+ }+ cmd.output().is_ok()}