Add video support and improve mpv process management

- Enable video playback by removing --no-video flag
- Add --profile=fast for better performance
- Add --audio-display=no to prevent cover art windows
- Implement mpv process respawn when closed
- Add process death detection and cleanup
- Show refresh status immediately in title bar
- Fix playlist playback after clearing
This commit is contained in:
Christoffer Martinsson 2025-12-06 16:07:50 +01:00
parent 4b2757b17f
commit f2f79cc0d2
2 changed files with 92 additions and 8 deletions

View File

@ -81,6 +81,13 @@ async fn run_app<B: ratatui::backend::Backend>(
player: &mut player::Player, player: &mut player::Player,
) -> Result<()> { ) -> Result<()> {
loop { loop {
// Check if mpv process died (e.g., user closed video window)
if !player.is_process_alive() && state.player_state != PlayerState::Stopped {
state.player_state = PlayerState::Stopped;
state.current_position = 0.0;
state.current_duration = 0.0;
}
// Update player properties from MPV // Update player properties from MPV
player.update_properties(); player.update_properties();
@ -105,7 +112,7 @@ async fn run_app<B: ratatui::backend::Backend>(
if event::poll(std::time::Duration::from_millis(100))? { if event::poll(std::time::Duration::from_millis(100))? {
if let Event::Key(key) = event::read()? { if let Event::Key(key) = event::read()? {
if key.kind == KeyEventKind::Press { if key.kind == KeyEventKind::Press {
handle_key_event(state, player, key).await?; handle_key_event(terminal, state, player, key).await?;
} }
} }
} }
@ -118,7 +125,7 @@ async fn run_app<B: ratatui::backend::Backend>(
Ok(()) Ok(())
} }
async fn handle_key_event(state: &mut AppState, player: &mut player::Player, key: KeyEvent) -> Result<()> { async fn handle_key_event<B: ratatui::backend::Backend>(terminal: &mut Terminal<B>, state: &mut AppState, player: &mut player::Player, key: KeyEvent) -> Result<()> {
// Handle search mode separately // Handle search mode separately
if state.search_mode { if state.search_mode {
match key.code { match key.code {
@ -261,6 +268,7 @@ async fn handle_key_event(state: &mut AppState, player: &mut player::Player, key
} }
(KeyCode::Char('r'), _) => { (KeyCode::Char('r'), _) => {
state.is_refreshing = true; state.is_refreshing = true;
terminal.draw(|f| ui::render(f, state))?; // Show "Refreshing library..." immediately
tracing::info!("Rescanning..."); tracing::info!("Rescanning...");
let cache_dir = cache::get_cache_dir()?; let cache_dir = cache::get_cache_dir()?;
let new_cache = scanner::scan_paths(&state.config.scan_paths.paths)?; let new_cache = scanner::scan_paths(&state.config.scan_paths.paths)?;

View File

@ -27,8 +27,9 @@ impl Player {
// Spawn MPV with IPC server // Spawn MPV with IPC server
let process = Command::new("mpv") let process = Command::new("mpv")
.arg("--idle") .arg("--idle")
.arg("--no-video")
.arg("--no-terminal") .arg("--no-terminal")
.arg("--profile=fast")
.arg("--audio-display=no") // Don't show cover art for audio files
.arg(format!("--input-ipc-server={}", socket_path.display())) .arg(format!("--input-ipc-server={}", socket_path.display()))
.stdin(Stdio::null()) .stdin(Stdio::null())
.stdout(Stdio::null()) .stdout(Stdio::null())
@ -54,14 +55,60 @@ impl Player {
fn connect(&mut self) -> Result<()> { fn connect(&mut self) -> Result<()> {
if self.socket.is_none() { if self.socket.is_none() {
let stream = UnixStream::connect(&self.socket_path) // Try to connect, if it fails, respawn mpv
.context("Failed to connect to MPV IPC socket")?; match UnixStream::connect(&self.socket_path) {
stream.set_nonblocking(true).ok(); Ok(stream) => {
self.socket = Some(stream); stream.set_nonblocking(true).ok();
self.socket = Some(stream);
}
Err(_) => {
// MPV probably died, respawn it
self.respawn()?;
let stream = UnixStream::connect(&self.socket_path)
.context("Failed to connect to MPV IPC socket after respawn")?;
stream.set_nonblocking(true).ok();
self.socket = Some(stream);
}
}
} }
Ok(()) Ok(())
} }
fn respawn(&mut self) -> Result<()> {
// Kill old process if still running
self.process.kill().ok();
self.process.wait().ok();
// Clean up old socket
std::fs::remove_file(&self.socket_path).ok();
// Spawn new MPV process
let process = Command::new("mpv")
.arg("--idle")
.arg("--no-terminal")
.arg("--profile=fast")
.arg("--audio-display=no")
.arg(format!("--input-ipc-server={}", self.socket_path.display()))
.stdin(Stdio::null())
.stdout(Stdio::null())
.stderr(Stdio::null())
.spawn()
.context("Failed to respawn MPV process")?;
self.process = process;
self.socket = None;
self.is_idle = true;
self.position = 0.0;
self.duration = 0.0;
self.is_paused = false;
// Wait for socket to be created and mpv to be ready
std::thread::sleep(Duration::from_millis(800));
tracing::info!("MPV process respawned");
Ok(())
}
fn send_command(&mut self, command: &str, args: &[Value]) -> Result<()> { fn send_command(&mut self, command: &str, args: &[Value]) -> Result<()> {
self.connect()?; self.connect()?;
@ -74,7 +121,17 @@ impl Player {
if let Some(ref mut socket) = self.socket { if let Some(ref mut socket) = self.socket {
let msg = format!("{}\n", cmd); let msg = format!("{}\n", cmd);
socket.write_all(msg.as_bytes()).context("Failed to write to socket")?; // Ignore broken pipe errors (mpv closed)
if let Err(e) = socket.write_all(msg.as_bytes()) {
if e.kind() == std::io::ErrorKind::BrokenPipe {
self.socket = None;
self.is_idle = true;
// Clean up dead process
self.process.kill().ok();
return Ok(());
}
return Err(e).context("Failed to write to socket");
}
} }
Ok(()) Ok(())
@ -178,6 +235,25 @@ impl Player {
self.is_idle self.is_idle
} }
pub fn is_process_alive(&mut self) -> bool {
// Check if mpv process is still running
match self.process.try_wait() {
Ok(Some(_)) => {
// Process has exited - clean up socket
self.socket = None;
self.is_idle = true;
false
}
Ok(None) => true, // Process is still running
Err(_) => {
// Error checking, assume dead and clean up
self.socket = None;
self.is_idle = true;
false
}
}
}
pub fn seek(&mut self, seconds: f64) -> Result<()> { pub fn seek(&mut self, seconds: f64) -> Result<()> {
self.send_command("seek", &[json!(seconds), json!("relative")])?; self.send_command("seek", &[json!(seconds), json!("relative")])?;
Ok(()) Ok(())