Add metadata display and optimize CPU usage

Metadata features:
- Display artist, album, title in bottom status bar (left-aligned)
- Display bitrate, codec, sample rate in bottom status bar (right-aligned)
- Fetch metadata from MPV using metadata/by-key properties
- Support both lowercase and uppercase metadata tags

Performance optimizations:
- Split property updates: fast updates (position/duration) vs slow (metadata)
- Update metadata only every 2 seconds instead of every 100ms
- Skip MPV property updates entirely when stopped
- Conditional UI redraws - only when state actually changes
- Variable poll rate: 200ms when stopped, 100ms when playing
- Position update throttling (0.5s minimum change)
- Reduces CPU usage from constant 10 FPS to ~0.1 FPS when idle

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-player"
-version = "0.1.8"
+version = "0.1.10"
 edition = "2021"
 
 [dependencies]

src/main.rs

@@ -7,7 +7,7 @@ mod ui;
 
 use anyhow::{Context, Result};
 use crossterm::{
-    event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers},
+    event::{self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers},
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
@@ -56,7 +56,7 @@ async fn main() -> Result<()> {
     // Setup terminal
     enable_raw_mode()?;
     let mut stdout = io::stdout();
-    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
+    execute!(stdout, EnterAlternateScreen)?;
     let backend = CrosstermBackend::new(stdout);
     let mut terminal = Terminal::new(backend)?;
 
@@ -67,8 +67,7 @@ async fn main() -> Result<()> {
     disable_raw_mode()?;
     execute!(
         terminal.backend_mut(),
-        LeaveAlternateScreen,
-        DisableMouseCapture
+        LeaveAlternateScreen
     )?;
     terminal.show_cursor()?;
 
@@ -80,39 +79,85 @@ async fn run_app<B: ratatui::backend::Backend>(
     state: &mut AppState,
     player: &mut player::Player,
 ) -> Result<()> {
+    let mut metadata_update_counter = 0u32;
+    let mut last_position = 0.0f64;
+    let mut needs_redraw = true;
+
     loop {
+        let mut state_changed = false;
+
         // 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;
+            state_changed = true;
         }
 
-        // Update player properties from MPV
-        player.update_properties();
+        // Only update properties when playing or paused (not when stopped)
+        if state.player_state != PlayerState::Stopped {
+            player.update_properties();
 
-        // Update position and duration from player
-        state.current_position = player.get_position().unwrap_or(0.0);
-        state.current_duration = player.get_duration().unwrap_or(0.0);
+            // Update metadata only every 20 iterations (~2 seconds) to reduce IPC calls
+            metadata_update_counter += 1;
+            if metadata_update_counter >= 20 {
+                player.update_metadata();
+                metadata_update_counter = 0;
+                state_changed = true;
+            }
 
-        // Check if track ended and play next
-        if player.is_idle() && state.player_state == PlayerState::Playing {
-            if state.playlist_index + 1 < state.playlist.len() {
-                state.play_next();
-                if let Some(ref path) = state.current_file {
-                    player.play(path)?;
+            // Update position and duration from player
+            let new_position = player.get_position().unwrap_or(0.0);
+            let new_duration = player.get_duration().unwrap_or(0.0);
+
+            // Only mark as changed if position moved by at least 0.5 seconds
+            if (new_position - last_position).abs() >= 0.5 {
+                state.current_position = new_position;
+                last_position = new_position;
+                state_changed = true;
+            }
+
+            if state.current_duration != new_duration {
+                state.current_duration = new_duration;
+                state_changed = true;
+            }
+
+            // Check if track ended and play next (but only if track was actually loaded)
+            if player.is_idle() && state.player_state == PlayerState::Playing && state.current_duration > 0.0 {
+                if state.playlist_index + 1 < state.playlist.len() {
+                    state.play_next();
+                    if let Some(ref path) = state.current_file {
+                        player.play(path)?;
+                    }
+                    // Update metadata immediately when track changes
+                    player.update_metadata();
+                    metadata_update_counter = 0;
+                    state_changed = true;
+                } else {
+                    state.player_state = PlayerState::Stopped;
+                    state_changed = true;
                 }
-            } else {
-                state.player_state = PlayerState::Stopped;
             }
         }
 
-        terminal.draw(|f| ui::render(f, state))?;
+        // Only redraw if something changed or forced
+        if needs_redraw || state_changed {
+            terminal.draw(|f| ui::render(f, state, player))?;
+            needs_redraw = false;
+        }
 
-        if event::poll(std::time::Duration::from_millis(100))? {
+        // Poll for events - use longer timeout when stopped to reduce CPU
+        let poll_duration = if state.player_state == PlayerState::Stopped {
+            std::time::Duration::from_millis(200) // 5 FPS when stopped
+        } else {
+            std::time::Duration::from_millis(100) // 10 FPS when playing/paused
+        };
+
+        if event::poll(poll_duration)? {
             if let Event::Key(key) = event::read()? {
                 if key.kind == KeyEventKind::Press {
                     handle_key_event(terminal, state, player, key).await?;
+                    needs_redraw = true; // Force redraw after key event
                 }
             }
         }
@@ -157,10 +202,17 @@ async fn handle_key_event<B: ratatui::backend::Backend>(terminal: &mut Terminal<
             state.should_quit = true;
         }
         (KeyCode::Char('/'), _) => {
-            state.enter_search_mode();
+            if state.search_mode && state.search_query.is_empty() {
+                // Exit search mode only if search query is blank
+                state.exit_search_mode();
+            } else if !state.search_mode {
+                state.enter_search_mode();
+            }
         }
         (KeyCode::Esc, _) => {
-            state.search_matches.clear();
+            if !state.search_matches.is_empty() {
+                state.search_matches.clear();
+            }
             if state.visual_mode {
                 state.visual_mode = false;
                 state.marked_files.clear();
@@ -169,38 +221,74 @@ async fn handle_key_event<B: ratatui::backend::Backend>(terminal: &mut Terminal<
         (KeyCode::Char('n'), _) => {
             if !state.search_matches.is_empty() {
                 state.next_search_match();
-            } else if !state.playlist.is_empty() {
-                // Advance to next track
-                if state.playlist_index + 1 < state.playlist.len() {
-                    state.playlist_index += 1;
-                    state.current_file = Some(state.playlist[state.playlist_index].clone());
+            }
+        }
+        (KeyCode::Char('N'), KeyModifiers::SHIFT) => {
+            if !state.search_matches.is_empty() {
+                state.prev_search_match();
+            }
+        }
+        (KeyCode::Char('J'), KeyModifiers::SHIFT) => {
+            // Next track
+            if !state.playlist.is_empty() && state.playlist_index + 1 < state.playlist.len() {
+                state.playlist_index += 1;
+                state.current_file = Some(state.playlist[state.playlist_index].clone());
 
-                    match state.player_state {
-                        PlayerState::Playing => {
-                            // Keep playing
-                            if let Some(ref path) = state.current_file {
-                                player.play(path)?;
-                                tracing::info!("Next track: {:?}", path);
-                            }
+                match state.player_state {
+                    PlayerState::Playing => {
+                        // Keep playing
+                        if let Some(ref path) = state.current_file {
+                            player.play(path)?;
+                            player.update_metadata(); // Update metadata immediately
+                            tracing::info!("Next track: {:?}", path);
                         }
-                        PlayerState::Paused => {
-                            // Load but stay paused
-                            if let Some(ref path) = state.current_file {
-                                player.play(path)?;
-                                player.pause()?;
-                                tracing::info!("Next track (paused): {:?}", path);
-                            }
-                        }
-                        PlayerState::Stopped => {
-                            // Just update current file, stay stopped
-                            tracing::info!("Next track selected (stopped): {:?}", state.current_file);
+                    }
+                    PlayerState::Paused => {
+                        // Load but stay paused
+                        if let Some(ref path) = state.current_file {
+                            player.play(path)?;
+                            player.update_metadata(); // Update metadata immediately
+                            player.pause()?;
+                            tracing::info!("Next track (paused): {:?}", path);
                         }
                     }
+                    PlayerState::Stopped => {
+                        // Just update current file, stay stopped
+                        tracing::info!("Next track selected (stopped): {:?}", state.current_file);
+                    }
                 }
             }
         }
-        (KeyCode::Char('N'), KeyModifiers::SHIFT) => {
-            state.prev_search_match();
+        (KeyCode::Char('K'), KeyModifiers::SHIFT) => {
+            // Previous track
+            if !state.playlist.is_empty() && state.playlist_index > 0 {
+                state.playlist_index -= 1;
+                state.current_file = Some(state.playlist[state.playlist_index].clone());
+
+                match state.player_state {
+                    PlayerState::Playing => {
+                        // Keep playing
+                        if let Some(ref path) = state.current_file {
+                            player.play(path)?;
+                            player.update_metadata(); // Update metadata immediately
+                            tracing::info!("Previous track: {:?}", path);
+                        }
+                    }
+                    PlayerState::Paused => {
+                        // Load but stay paused
+                        if let Some(ref path) = state.current_file {
+                            player.play(path)?;
+                            player.update_metadata(); // Update metadata immediately
+                            player.pause()?;
+                            tracing::info!("Previous track (paused): {:?}", path);
+                        }
+                    }
+                    PlayerState::Stopped => {
+                        // Just update current file, stay stopped
+                        tracing::info!("Previous track selected (stopped): {:?}", state.current_file);
+                    }
+                }
+            }
         }
         (KeyCode::Char('d'), KeyModifiers::CONTROL) => {
             state.page_down();
@@ -233,38 +321,11 @@ async fn handle_key_event<B: ratatui::backend::Backend>(terminal: &mut Terminal<
         (KeyCode::Char('c'), _) => {
             state.clear_playlist();
         }
-        (KeyCode::Char('p'), _) => {
-            if !state.playlist.is_empty() && state.playlist_index > 0 {
-                state.playlist_index -= 1;
-                state.current_file = Some(state.playlist[state.playlist_index].clone());
-
-                match state.player_state {
-                    PlayerState::Playing => {
-                        // Keep playing
-                        if let Some(ref path) = state.current_file {
-                            player.play(path)?;
-                            tracing::info!("Previous track: {:?}", path);
-                        }
-                    }
-                    PlayerState::Paused => {
-                        // Load but stay paused
-                        if let Some(ref path) = state.current_file {
-                            player.play(path)?;
-                            player.pause()?;
-                            tracing::info!("Previous track (paused): {:?}", path);
-                        }
-                    }
-                    PlayerState::Stopped => {
-                        // Just update current file, stay stopped
-                        tracing::info!("Previous track selected (stopped): {:?}", state.current_file);
-                    }
-                }
-            }
-        }
         (KeyCode::Enter, _) => {
             state.play_selection();
             if let Some(ref path) = state.current_file {
                 player.play(path)?;
+                player.update_metadata(); // Update metadata immediately when playing new file
                 tracing::info!("Playing: {:?} (playlist: {} tracks)", path, state.playlist.len());
             }
             if state.visual_mode {
@@ -299,19 +360,20 @@ async fn handle_key_event<B: ratatui::backend::Backend>(terminal: &mut Terminal<
                         state.player_state = PlayerState::Playing;
                         if let Some(ref path) = state.current_file {
                             player.play(path)?;
+                            player.update_metadata(); // Update metadata immediately
                             tracing::info!("Restarting playback: {:?}", path);
                         }
                     }
                 }
             }
         }
-        (KeyCode::Left, _) => {
+        (KeyCode::Char('H'), KeyModifiers::SHIFT) => {
             if state.player_state != PlayerState::Stopped {
                 player.seek(-10.0)?;
                 tracing::info!("Seek backward 10s");
             }
         }
-        (KeyCode::Right, _) => {
+        (KeyCode::Char('L'), KeyModifiers::SHIFT) => {
             if state.player_state != PlayerState::Stopped {
                 player.seek(10.0)?;
                 tracing::info!("Seek forward 10s");
@@ -331,7 +393,7 @@ async fn handle_key_event<B: ratatui::backend::Backend>(terminal: &mut Terminal<
         }
         (KeyCode::Char('r'), _) => {
             state.is_refreshing = true;
-            terminal.draw(|f| ui::render(f, state))?;  // Show "Refreshing library..." immediately
+            terminal.draw(|f| ui::render(f, state, player))?;  // Show "Refreshing library..." immediately
             tracing::info!("Rescanning...");
             let cache_dir = cache::get_cache_dir()?;
             let new_cache = scanner::scan_paths(&state.config.scan_paths.paths)?;

src/player/mod.rs

@@ -15,6 +15,12 @@ pub struct Player {
     duration: f64,
     is_paused: bool,
     is_idle: bool,
+    pub media_title: Option<String>,
+    pub artist: Option<String>,
+    pub album: Option<String>,
+    pub audio_codec: Option<String>,
+    pub audio_bitrate: Option<f64>,
+    pub sample_rate: Option<i64>,
 }
 
 impl Player {
@@ -50,6 +56,12 @@ impl Player {
             duration: 0.0,
             is_paused: false,
             is_idle: true,
+            media_title: None,
+            artist: None,
+            album: None,
+            audio_codec: None,
+            audio_bitrate: None,
+            sample_rate: None,
         })
     }
 
@@ -101,6 +113,12 @@ impl Player {
         self.position = 0.0;
         self.duration = 0.0;
         self.is_paused = false;
+        self.media_title = None;
+        self.artist = None;
+        self.album = None;
+        self.audio_codec = None;
+        self.audio_bitrate = None;
+        self.sample_rate = None;
 
         // Wait for socket to be created and mpv to be ready
         std::thread::sleep(Duration::from_millis(800));
@@ -230,6 +248,63 @@ impl Player {
         }
     }
 
+    pub fn update_metadata(&mut self) {
+        // Try to get artist directly
+        if let Some(val) = self.get_property("metadata/by-key/artist") {
+            self.artist = val.as_str().map(|s| s.to_string());
+        }
+        // Fallback to ARTIST (uppercase)
+        if self.artist.is_none() {
+            if let Some(val) = self.get_property("metadata/by-key/ARTIST") {
+                self.artist = val.as_str().map(|s| s.to_string());
+            }
+        }
+
+        // Try to get album directly
+        if let Some(val) = self.get_property("metadata/by-key/album") {
+            self.album = val.as_str().map(|s| s.to_string());
+        }
+        // Fallback to ALBUM (uppercase)
+        if self.album.is_none() {
+            if let Some(val) = self.get_property("metadata/by-key/ALBUM") {
+                self.album = val.as_str().map(|s| s.to_string());
+            }
+        }
+
+        // Try to get title directly
+        if let Some(val) = self.get_property("metadata/by-key/title") {
+            self.media_title = val.as_str().map(|s| s.to_string());
+        }
+        // Fallback to TITLE (uppercase)
+        if self.media_title.is_none() {
+            if let Some(val) = self.get_property("metadata/by-key/TITLE") {
+                self.media_title = val.as_str().map(|s| s.to_string());
+            }
+        }
+
+        // Final fallback to media-title if metadata doesn't have title
+        if self.media_title.is_none() {
+            if let Some(val) = self.get_property("media-title") {
+                self.media_title = val.as_str().map(|s| s.to_string());
+            }
+        }
+
+        // Update audio codec
+        if let Some(val) = self.get_property("audio-codec-name") {
+            self.audio_codec = val.as_str().map(|s| s.to_string());
+        }
+
+        // Update audio bitrate (convert from bps to kbps)
+        if let Some(val) = self.get_property("audio-bitrate") {
+            self.audio_bitrate = val.as_f64().map(|b| b / 1000.0);
+        }
+
+        // Update sample rate
+        if let Some(val) = self.get_property("audio-params/samplerate") {
+            self.sample_rate = val.as_i64();
+        }
+    }
+
     pub fn get_position(&self) -> Option<f64> {
         Some(self.position)
     }

src/state/mod.rs

@@ -29,12 +29,13 @@ pub struct AppState {
     pub is_refreshing: bool,
     pub search_mode: bool,
     pub search_query: String,
-    pub search_matches: Vec<usize>,
+    pub search_matches: Vec<PathBuf>,
     pub search_match_index: usize,
     pub tab_search_results: Vec<PathBuf>,
     pub tab_search_index: usize,
     pub visual_mode: bool,
     pub visual_anchor: usize,
+    pub saved_expanded_dirs: HashSet<PathBuf>,
 }
 
 #[derive(Debug, Clone)]
@@ -75,6 +76,7 @@ impl AppState {
             tab_search_index: 0,
             visual_mode: false,
             visual_anchor: 0,
+            saved_expanded_dirs: HashSet::new(),
         }
     }
 
@@ -139,9 +141,13 @@ impl AppState {
                 let was_expanded = self.expanded_dirs.contains(&path);
 
                 if was_expanded {
-                    // Close the expanded folder
+                    // Close the expanded folder and keep selection on it
                     self.expanded_dirs.remove(&path);
                     self.rebuild_flattened_items();
+                    // Find the collapsed folder and select it
+                    if let Some(idx) = self.flattened_items.iter().position(|i| i.node.path == path) {
+                        self.selected_index = idx;
+                    }
                 } else {
                     // Folder is collapsed, close parent instead and jump to it
                     if let Some(parent) = path.parent() {
@@ -298,7 +304,7 @@ impl AppState {
         self.rebuild_flattened_items();
     }
 
-    fn rebuild_flattened_items(&mut self) {
+    pub fn rebuild_flattened_items(&mut self) {
         self.flattened_items = flatten_tree(&self.cache.file_tree, 0, &self.expanded_dirs);
         if self.selected_index >= self.flattened_items.len() {
             self.selected_index = self.flattened_items.len().saturating_sub(1);
@@ -312,12 +318,17 @@ impl AppState {
         self.search_match_index = 0;
         self.tab_search_results.clear();
         self.tab_search_index = 0;
+        // Save current folder state
+        self.saved_expanded_dirs = self.expanded_dirs.clone();
     }
 
     pub fn exit_search_mode(&mut self) {
         self.search_mode = false;
         self.tab_search_results.clear();
         self.tab_search_index = 0;
+        // Restore folder state from before search
+        self.expanded_dirs = self.saved_expanded_dirs.clone();
+        self.rebuild_flattened_items();
     }
 
     pub fn append_search_char(&mut self, c: char) {
@@ -347,29 +358,34 @@ impl AppState {
             return;
         }
 
-        // Sort by score (highest first)
-        matching_paths_with_scores.sort_by(|a, b| b.1.cmp(&a.1));
+        // Add index to preserve original tree order when scores are equal
+        let mut indexed_matches: Vec<(PathBuf, i32, usize)> = matching_paths_with_scores
+            .into_iter()
+            .enumerate()
+            .map(|(idx, (path, score))| (path, score, idx))
+            .collect();
+
+        // Sort by score (highest first), then by original index to prefer first occurrence
+        indexed_matches.sort_by(|a, b| b.1.cmp(&a.1).then_with(|| a.2.cmp(&b.2)));
 
         // Store all matches for tab completion
-        self.tab_search_results = matching_paths_with_scores.iter().map(|(path, _)| path.clone()).collect();
+        self.tab_search_results = indexed_matches.iter().map(|(path, _, _)| path.clone()).collect();
         self.tab_search_index = 0;
 
-        // Expand parent directories of ALL matches (not just best match)
-        // This ensures folders deep in the tree become visible
-        for (path, _) in &matching_paths_with_scores {
-            let mut parent = path.parent();
-            while let Some(p) = parent {
-                self.expanded_dirs.insert(p.to_path_buf());
-                parent = p.parent();
-            }
+        // Close all folders and expand only for the best match
+        self.expanded_dirs.clear();
+        let best_match = self.tab_search_results[0].clone();
+        let mut parent = best_match.parent();
+        while let Some(p) = parent {
+            self.expanded_dirs.insert(p.to_path_buf());
+            parent = p.parent();
         }
 
         // Rebuild flattened items
         self.rebuild_flattened_items();
 
         // Find the best match in the flattened list and jump to it
-        let best_match = &self.tab_search_results[0];
-        if let Some(idx) = self.flattened_items.iter().position(|item| &item.node.path == best_match) {
+        if let Some(idx) = self.flattened_items.iter().position(|item| item.node.path == best_match) {
             self.selected_index = idx;
         }
     }
@@ -380,7 +396,7 @@ impl AppState {
             return;
         }
 
-        // Collect all matching paths with scores
+        // Collect all matching paths with scores and preserve order
         let mut matching_paths_with_scores = Vec::new();
         collect_matching_paths(&self.cache.file_tree, &self.search_query, &mut matching_paths_with_scores);
 
@@ -389,35 +405,43 @@ impl AppState {
             return;
         }
 
-        // Sort by score (highest first)
-        matching_paths_with_scores.sort_by(|a, b| b.1.cmp(&a.1));
+        // Add index to preserve original tree order when scores are equal
+        let mut indexed_matches: Vec<(PathBuf, i32, usize)> = matching_paths_with_scores
+            .into_iter()
+            .enumerate()
+            .map(|(idx, (path, score))| (path, score, idx))
+            .collect();
+
+        // Sort by score (highest first), then by original index to prefer first occurrence
+        indexed_matches.sort_by(|a, b| b.1.cmp(&a.1).then_with(|| a.2.cmp(&b.2)));
+
+        let matching_paths_with_scores: Vec<(PathBuf, i32)> = indexed_matches
+            .into_iter()
+            .map(|(path, score, _)| (path, score))
+            .collect();
         let matching_paths: Vec<PathBuf> = matching_paths_with_scores.iter().map(|(path, _)| path.clone()).collect();
 
-        // Expand all parent directories
-        for path in &matching_paths {
-            let mut parent = path.parent();
+        // Store matching paths (not indices, as they change when folders collapse)
+        self.search_matches = matching_paths;
+
+        if !self.search_matches.is_empty() {
+            self.search_match_index = 0;
+            // Close all folders and expand only for first match
+            self.expanded_dirs.clear();
+            let first_match = self.search_matches[0].clone();
+            let mut parent = first_match.parent();
             while let Some(p) = parent {
                 self.expanded_dirs.insert(p.to_path_buf());
                 parent = p.parent();
             }
-        }
 
-        // Rebuild flattened items
-        self.rebuild_flattened_items();
+            // Rebuild flattened items
+            self.rebuild_flattened_items();
 
-        // Find indices of matches in the flattened list
-        self.search_matches = matching_paths
-            .iter()
-            .filter_map(|path| {
-                self.flattened_items
-                    .iter()
-                    .position(|item| &item.node.path == path)
-            })
-            .collect();
-
-        if !self.search_matches.is_empty() {
-            self.search_match_index = 0;
-            self.selected_index = self.search_matches[0];
+            // Find first match in flattened list
+            if let Some(idx) = self.flattened_items.iter().position(|item| item.node.path == first_match) {
+                self.selected_index = idx;
+            }
         }
 
         self.search_mode = false;
@@ -426,7 +450,23 @@ impl AppState {
     pub fn next_search_match(&mut self) {
         if !self.search_matches.is_empty() {
             self.search_match_index = (self.search_match_index + 1) % self.search_matches.len();
-            self.selected_index = self.search_matches[self.search_match_index];
+            let target_path = self.search_matches[self.search_match_index].clone();
+
+            // Close all folders and expand only for this match
+            self.expanded_dirs.clear();
+            let mut parent = target_path.parent();
+            while let Some(p) = parent {
+                self.expanded_dirs.insert(p.to_path_buf());
+                parent = p.parent();
+            }
+
+            // Rebuild flattened items
+            self.rebuild_flattened_items();
+
+            // Find the path in current flattened items
+            if let Some(idx) = self.flattened_items.iter().position(|item| item.node.path == target_path) {
+                self.selected_index = idx;
+            }
         }
     }
 
@@ -437,7 +477,23 @@ impl AppState {
             } else {
                 self.search_match_index -= 1;
             }
-            self.selected_index = self.search_matches[self.search_match_index];
+            let target_path = self.search_matches[self.search_match_index].clone();
+
+            // Close all folders and expand only for this match
+            self.expanded_dirs.clear();
+            let mut parent = target_path.parent();
+            while let Some(p) = parent {
+                self.expanded_dirs.insert(p.to_path_buf());
+                parent = p.parent();
+            }
+
+            // Rebuild flattened items
+            self.rebuild_flattened_items();
+
+            // Find the path in current flattened items
+            if let Some(idx) = self.flattened_items.iter().position(|item| item.node.path == target_path) {
+                self.selected_index = idx;
+            }
         }
     }
 
@@ -450,7 +506,8 @@ impl AppState {
         self.tab_search_index = (self.tab_search_index + 1) % self.tab_search_results.len();
         let next_match = self.tab_search_results[self.tab_search_index].clone();
 
-        // Expand parent directories
+        // Close all folders and expand only for this match
+        self.expanded_dirs.clear();
         let mut parent = next_match.parent();
         while let Some(p) = parent {
             self.expanded_dirs.insert(p.to_path_buf());
@@ -479,7 +536,8 @@ impl AppState {
         }
         let prev_match = self.tab_search_results[self.tab_search_index].clone();
 
-        // Expand parent directories
+        // Close all folders and expand only for this match
+        self.expanded_dirs.clear();
         let mut parent = prev_match.parent();
         while let Some(p) = parent {
             self.expanded_dirs.insert(p.to_path_buf());
@@ -570,9 +628,6 @@ fn fuzzy_match(text: &str, query: &str) -> Option<i32> {
         }
     }
 
-    // Bonus for shorter strings (better matches)
-    score += 100 - text_lower.len() as i32;
-
     Some(score)
 }
 

src/ui/mod.rs

@@ -1,5 +1,6 @@
 mod theme;
 
+use crate::player::Player;
 use crate::state::{AppState, PlayerState};
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
@@ -10,7 +11,7 @@ use ratatui::{
 };
 use theme::Theme;
 
-pub fn render(frame: &mut Frame, state: &mut AppState) {
+pub fn render(frame: &mut Frame, state: &mut AppState, player: &Player) {
     // Clear background
     frame.render_widget(
         Block::default().style(Theme::secondary()),
@@ -36,7 +37,69 @@ pub fn render(frame: &mut Frame, state: &mut AppState) {
     render_title_bar(frame, state, main_chunks[0]);
     render_file_panel(frame, state, content_chunks[0]);
     render_right_panel(frame, state, content_chunks[1]);
-    render_status_bar(frame, state, main_chunks[2]);
+    render_status_bar(frame, state, player, main_chunks[2]);
+}
+
+fn highlight_search_matches<'a>(text: &str, query: &str, search_typing: bool, is_selected: bool) -> Vec<Span<'a>> {
+    let query_lower = query.to_lowercase();
+
+    let mut spans = Vec::new();
+    let mut query_chars = query_lower.chars();
+    let mut current_query_char = query_chars.next();
+    let mut current_segment = String::new();
+
+    for ch in text.chars() {
+        let ch_lower = ch.to_lowercase().next().unwrap();
+
+        if let Some(query_ch) = current_query_char {
+            if ch_lower == query_ch {
+                // Found a match - flush current segment
+                if !current_segment.is_empty() {
+                    spans.push(Span::raw(current_segment.clone()));
+                    current_segment.clear();
+                }
+                // Add matched character with styling based on mode
+                if search_typing && is_selected {
+                    // While typing on selected row: green bg with black fg (inverted)
+                    spans.push(Span::styled(
+                        ch.to_string(),
+                        Style::default()
+                            .fg(Theme::background())
+                            .bg(Theme::success()),
+                    ));
+                } else if !search_typing && is_selected {
+                    // After Enter on selected row: bold black text on blue selection bar
+                    spans.push(Span::styled(
+                        ch.to_string(),
+                        Style::default()
+                            .fg(Theme::background())
+                            .add_modifier(Modifier::BOLD),
+                    ));
+                } else {
+                    // Other rows: just green text
+                    spans.push(Span::styled(
+                        ch.to_string(),
+                        Style::default().fg(Theme::success()),
+                    ));
+                }
+                // Move to next query character
+                current_query_char = query_chars.next();
+            } else {
+                // No match - add to current segment
+                current_segment.push(ch);
+            }
+        } else {
+            // No more query characters to match
+            current_segment.push(ch);
+        }
+    }
+
+    // Flush remaining segment
+    if !current_segment.is_empty() {
+        spans.push(Span::raw(current_segment));
+    }
+
+    spans
 }
 
 fn render_file_panel(frame: &mut Frame, state: &mut AppState, area: Rect) {
@@ -44,6 +107,10 @@ fn render_file_panel(frame: &mut Frame, state: &mut AppState, area: Rect) {
     let visible_height = area.height.saturating_sub(2) as usize;
     state.update_scroll_offset(visible_height);
 
+    let in_search = state.search_mode || !state.search_matches.is_empty();
+    let search_typing = state.search_mode; // True when actively typing search
+    let search_query = if in_search { state.search_query.to_lowercase() } else { String::new() };
+
     let items: Vec<ListItem> = state
         .flattened_items
         .iter()
@@ -51,20 +118,56 @@ fn render_file_panel(frame: &mut Frame, state: &mut AppState, area: Rect) {
         .map(|(idx, item)| {
             let indent = "  ".repeat(item.depth);
             let mark = if state.marked_files.contains(&item.node.path) { "* " } else { "" };
-            let suffix = if item.node.is_dir { "/" } else { "" };
-            let text = format!("{}{}{}{}", indent, mark, item.node.name, suffix);
 
-            let style = if idx == state.selected_index {
+            // Build name with search highlighting
+            let is_selected = idx == state.selected_index;
+
+            // Add folder icon for directories
+            let icon = if item.node.is_dir {
+                // Bold black icon on selection bar, blue otherwise
+                if !search_typing && is_selected {
+                    Span::styled("▸ ", Style::default().fg(Theme::background()).add_modifier(Modifier::BOLD))
+                } else {
+                    Span::styled("▸ ", Style::default().fg(Theme::highlight()))
+                }
+            } else {
+                Span::raw("  ")
+            };
+            let name_spans = if in_search && !search_query.is_empty() {
+                highlight_search_matches(&item.node.name, &search_query, search_typing, is_selected)
+            } else {
+                vec![Span::raw(&item.node.name)]
+            };
+
+            let suffix = if item.node.is_dir { "/" } else { "" };
+
+            let base_style = if search_typing {
+                // While typing search: no selection bar, just normal colors
+                if state.marked_files.contains(&item.node.path) {
+                    Theme::marked()
+                } else {
+                    Theme::secondary()
+                }
+            } else if is_selected {
+                // After pressing Enter or normal mode: normal blue selection bar
                 Theme::selected()
-            } else if item.node.is_dir {
-                Theme::directory()
             } else if state.marked_files.contains(&item.node.path) {
                 Theme::marked()
             } else {
                 Theme::secondary()
             };
 
-            ListItem::new(text).style(style)
+            let mut line_spans = vec![
+                Span::raw(indent),
+                Span::raw(mark),
+                icon,
+            ];
+            line_spans.extend(name_spans);
+            line_spans.push(Span::raw(suffix));
+
+            let line = Line::from(line_spans);
+
+            ListItem::new(line).style(base_style)
         })
         .collect();
 
@@ -78,7 +181,11 @@ fn render_file_panel(frame: &mut Frame, state: &mut AppState, area: Rect) {
         );
 
     let mut list_state = ListState::default();
-    list_state.select(Some(state.selected_index));
+    // Don't show selection bar widget while typing search - we use inverted colors instead
+    // Show it in normal mode and after executing search (Enter)
+    if !search_typing {
+        list_state.select(Some(state.selected_index));
+    }
     *list_state.offset_mut() = state.scroll_offset;
     frame.render_stateful_widget(list, area, &mut list_state);
 }
@@ -96,21 +203,11 @@ fn render_right_panel(frame: &mut Frame, state: &AppState, area: Rect) {
                 .unwrap_or_else(|| path.to_string_lossy().to_string());
 
             let style = if idx == state.playlist_index {
-                // Color based on player state with bold text
-                match state.player_state {
-                    PlayerState::Playing => Style::default()
-                        .fg(Theme::success())  // Green text
-                        .bg(Theme::background())
-                        .add_modifier(Modifier::BOLD),
-                    PlayerState::Paused => Style::default()
-                        .fg(Theme::highlight())  // Blue text
-                        .bg(Theme::background())
-                        .add_modifier(Modifier::BOLD),
-                    PlayerState::Stopped => Style::default()
-                        .fg(Theme::warning())  // Yellow/orange text
-                        .bg(Theme::background())
-                        .add_modifier(Modifier::BOLD),
-                }
+                // Current file: white bold
+                Style::default()
+                    .fg(Theme::bright_foreground())
+                    .bg(Theme::background())
+                    .add_modifier(Modifier::BOLD)
             } else {
                 Theme::secondary()
             };
@@ -140,7 +237,11 @@ fn render_right_panel(frame: &mut Frame, state: &AppState, area: Rect) {
 }
 
 fn render_title_bar(frame: &mut Frame, state: &AppState, area: Rect) {
-    let background_color = Theme::success(); // Green for normal operation
+    let background_color = match state.player_state {
+        PlayerState::Playing => Theme::success(),     // Green for playing
+        PlayerState::Paused => Theme::highlight(),    // Blue for paused
+        PlayerState::Stopped => Theme::dim_foreground(),   // Gray for stopped
+    };
 
     // Split the title bar into left and right sections
     let chunks = Layout::default()
@@ -217,29 +318,11 @@ fn render_title_bar(frame: &mut Frame, state: &AppState, area: Rect) {
 
         // Volume
         right_spans.push(Span::styled(
-            format!(" • Vol: {}%", state.volume),
+            format!(" • Vol: {}% ", state.volume),
             Style::default()
                 .fg(Theme::background())
                 .bg(background_color)
         ));
-
-        // Add search info if active
-        if !state.search_matches.is_empty() {
-            right_spans.push(Span::styled(
-                format!(" • Search: {}/{} ", state.search_match_index + 1, state.search_matches.len()),
-                Style::default()
-                    .fg(Theme::background())
-                    .bg(background_color)
-                    .add_modifier(Modifier::BOLD)
-            ));
-        } else {
-            right_spans.push(Span::styled(
-                " ",
-                Style::default()
-                    .fg(Theme::background())
-                    .bg(background_color)
-            ));
-        }
     }
 
     let right_title = Paragraph::new(Line::from(right_spans))
@@ -248,7 +331,7 @@ fn render_title_bar(frame: &mut Frame, state: &AppState, area: Rect) {
     frame.render_widget(right_title, chunks[1]);
 }
 
-fn render_status_bar(frame: &mut Frame, state: &AppState, area: Rect) {
+fn render_status_bar(frame: &mut Frame, state: &AppState, player: &Player, area: Rect) {
     if state.search_mode {
         // Show search prompt with current query and match count - LEFT aligned
         let search_text = if !state.tab_search_results.is_empty() {
@@ -261,6 +344,12 @@ fn render_status_bar(frame: &mut Frame, state: &AppState, area: Rect) {
         let status_bar = Paragraph::new(search_text)
             .style(Style::default().fg(Theme::foreground()).bg(Theme::background()));
         frame.render_widget(status_bar, area);
+    } else if !state.search_matches.is_empty() {
+        // Show search navigation when search results are active
+        let search_text = format!("Search: {}/{} • n: Next • N: Prev • Esc: Clear", state.search_match_index + 1, state.search_matches.len());
+        let status_bar = Paragraph::new(search_text)
+            .style(Style::default().fg(Theme::foreground()).bg(Theme::background()));
+        frame.render_widget(status_bar, area);
     } else if state.visual_mode {
         // Show visual mode indicator
         let visual_text = format!("-- VISUAL -- {} files marked", state.marked_files.len());
@@ -268,11 +357,66 @@ fn render_status_bar(frame: &mut Frame, state: &AppState, area: Rect) {
             .style(Style::default().fg(Theme::foreground()).bg(Theme::background()));
         frame.render_widget(status_bar, area);
     } else {
-        // Normal mode shortcuts (always shown when not in search or visual mode)
-        let shortcuts = "/: Search • v: Visual • a: Add • c: Clear • Enter: Play • Space: Pause • s: Stop • ←→: Seek • +/-: Vol • n/p: Next/Prev • r: Rescan • q: Quit";
-        let status_bar = Paragraph::new(shortcuts)
+        // Normal mode: show media metadata if playing
+        // Split into left (artist/album/title) and right (technical info)
+
+        let mut left_parts = Vec::new();
+        let mut right_parts = Vec::new();
+
+        // Left side: Artist | Album | Title
+        if let Some(ref artist) = player.artist {
+            left_parts.push(artist.clone());
+        }
+
+        if let Some(ref album) = player.album {
+            left_parts.push(album.clone());
+        }
+
+        if let Some(ref title) = player.media_title {
+            left_parts.push(title.clone());
+        }
+
+        // Right side: Bitrate | Codec | Sample rate
+        if let Some(bitrate) = player.audio_bitrate {
+            right_parts.push(format!("{:.0} kbps", bitrate));
+        }
+
+        if let Some(ref codec) = player.audio_codec {
+            right_parts.push(codec.to_uppercase());
+        }
+
+        if let Some(samplerate) = player.sample_rate {
+            right_parts.push(format!("{} Hz", samplerate));
+        }
+
+        // Create layout for left and right sections
+        let chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
+            .split(area);
+
+        // Left side text
+        let left_text = if !left_parts.is_empty() {
+            format!(" {}", left_parts.join(" | "))
+        } else {
+            String::new()
+        };
+
+        let left_bar = Paragraph::new(left_text)
             .style(Style::default().fg(Theme::muted_text()).bg(Theme::background()))
-            .alignment(Alignment::Center);
-        frame.render_widget(status_bar, area);
+            .alignment(Alignment::Left);
+        frame.render_widget(left_bar, chunks[0]);
+
+        // Right side text
+        let right_text = if !right_parts.is_empty() {
+            format!("{} ", right_parts.join(" | "))
+        } else {
+            String::new()
+        };
+
+        let right_bar = Paragraph::new(right_text)
+            .style(Style::default().fg(Theme::muted_text()).bg(Theme::background()))
+            .alignment(Alignment::Right);
+        frame.render_widget(right_bar, chunks[1]);
     }
 }

src/ui/theme.rs

@@ -86,12 +86,6 @@ impl Theme {
             .bg(Self::highlight())
     }
 
-    pub fn directory() -> Style {
-        Style::default()
-            .fg(Self::normal_blue())
-            .bg(Self::background())
-    }
-
     pub fn marked() -> Style {
         Style::default()
             .fg(Self::warning())