feat: recursively show directories in files list (#105)

src/gui/draw.rs

@@ -6,11 +6,16 @@ use egui::{
 use egui_dnd::dnd;
 use egui_extras::{Column, TableBuilder};
 use egui_material_icons::icons::*;
+use pwsp::types::gui::AudioPlayerState;
 use pwsp::types::socket::Request;
 use pwsp::types::{audio_player::TrackInfo, gui::AppState};
 use pwsp::utils::gui::{format_time_pair, make_request_async};
 use rust_i18n::t;
-use std::{path::Path, time::Instant};
+use std::{
+    cmp::Ordering,
+    path::{Path, PathBuf},
+    time::Instant,
+};
 
 enum TrackAction {
     Pause(u32),
@@ -26,6 +31,13 @@ enum HotkeyAction {
     Play(String),
 }
 
+enum FileAction {
+    Play(PathBuf, bool),
+    StopAndPlay(u32, PathBuf, bool),
+    AssignHotkey(PathBuf),
+    SetSelected(PathBuf),
+}
+
 impl SoundpadGui {
     fn get_volume_icon(volume: f32) -> &'static str {
         if volume > 0.7 {
@@ -782,10 +794,109 @@ impl SoundpadGui {
                 ui.set_min_height(area_size.y);
 
                 ui.vertical(|ui| {
+                    let mut actions = Vec::new();
                     let files = self.get_filtered_files();
-
                     for entry_path in files {
-                        let file_name = entry_path
+                        Self::draw_tree_node(
+                            ui,
+                            entry_path,
+                            &mut self.app_state,
+                            &self.audio_player_state,
+                            &mut actions,
+                        );
+                    }
+
+                    for action in actions {
+                        match action {
+                            FileAction::Play(path, concurrent) => self.play_file(&path, concurrent),
+                            FileAction::StopAndPlay(id, path, concurrent) => {
+                                self.stop(Some(id));
+                                self.play_file(&path, concurrent);
+                            }
+                            FileAction::AssignHotkey(path) => {
+                                self.app_state.assigning_hotkey_for_file = Some(path);
+                                self.app_state.hotkey_capture_active = true;
+                            }
+                            FileAction::SetSelected(path) => {
+                                self.app_state.selected_file = Some(path);
+                            }
+                        }
+                    }
+                });
+            });
+        });
+    }
+
+    fn draw_tree_node(
+        ui: &mut Ui,
+        path: std::path::PathBuf,
+        app_state: &mut AppState,
+        audio_player_state: &AudioPlayerState,
+        actions: &mut Vec<FileAction>,
+    ) {
+        if path.is_dir() {
+            let dir_name = path
+                .file_name()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string();
+            CollapsingHeader::new(dir_name)
+                .id_salt(&path)
+                .show(ui, |ui| {
+                    let children = if let Some(cached) = app_state.dir_cache.get(&path) {
+                        cached.clone()
+                    } else {
+                        let mut read = Vec::new();
+                        if let Ok(entries) = std::fs::read_dir(&path) {
+                            for entry in entries.filter_map(|e| e.ok()) {
+                                read.push(entry.path());
+                            }
+                        }
+                        read.sort_by(|a, b| {
+                            let a_is_dir = a.is_dir();
+                            let b_is_dir = b.is_dir();
+                            if a_is_dir && !b_is_dir {
+                                Ordering::Less
+                            } else if !a_is_dir && b_is_dir {
+                                Ordering::Greater
+                            } else {
+                                a.cmp(b)
+                            }
+                        });
+                        app_state.dir_cache.insert(path.clone(), read.clone());
+                        read
+                    };
+
+                    let search_query = app_state.search_query.to_lowercase();
+                    let search_query = search_query.trim();
+
+                    for child in children {
+                        if !child.is_dir() {
+                            if !crate::gui::SUPPORTED_EXTENSIONS.contains(
+                                &child
+                                    .extension()
+                                    .unwrap_or_default()
+                                    .to_str()
+                                    .unwrap_or_default(),
+                            ) {
+                                continue;
+                            }
+                            if !search_query.is_empty() {
+                                let file_name = child
+                                    .file_name()
+                                    .unwrap_or_default()
+                                    .to_string_lossy()
+                                    .to_string();
+                                if !file_name.to_lowercase().contains(search_query) {
+                                    continue;
+                                }
+                            }
+                        }
+                        Self::draw_tree_node(ui, child, app_state, audio_player_state, actions);
+                    }
+                });
+        } else {
+            let file_name = path
                 .file_name()
                 .unwrap_or_default()
                 .to_string_lossy()
@@ -793,7 +904,21 @@ impl SoundpadGui {
 
             ui.horizontal(|ui| {
                 // Hotkey badge
-                            let hotkey_badge = self.get_hotkey_badge(&entry_path);
+                let mut hotkey_badge = None;
+                for slot in &app_state.hotkey_config.slots {
+                    if slot.action.name == "play"
+                        && let Some(file_path_str) = slot.action.args.get("file_path")
+                        && Path::new(file_path_str) == path
+                    {
+                        if let Some(chord) = &slot.key_chord {
+                            hotkey_badge = Some(format!("[{}]", chord));
+                        } else {
+                            hotkey_badge = Some(format!("[{}]", slot.slot));
+                        }
+                        break;
+                    }
+                }
+
                 if let Some(badge) = &hotkey_badge {
                     ui.label(
                         RichText::new(badge)
@@ -804,8 +929,8 @@ impl SoundpadGui {
                 }
 
                 let mut file_button_text = RichText::new(&file_name);
-                            if let Some(current_file) = &self.app_state.selected_file
+                if let Some(current_file) = &app_state.selected_file
-                                && current_file.eq(&entry_path)
+                    && current_file.eq(&path)
                 {
                     file_button_text = file_button_text.color(Color32::WHITE);
                 }
@@ -815,18 +940,20 @@ impl SoundpadGui {
                 if file_button_response.clicked() {
                     ui.input(|i| {
                         if i.modifiers.ctrl {
-                                        self.play_file(&entry_path, true);
+                            actions.push(FileAction::Play(path.clone(), true));
                         } else if i.modifiers.shift
-                                        && let Some(last_track) =
+                            && let Some(last_track) = audio_player_state.tracks.last()
-                                            self.audio_player_state.tracks.last()
                         {
-                                        self.stop(Some(last_track.id));
+                            actions.push(FileAction::StopAndPlay(
-                                        self.play_file(&entry_path, true);
+                                last_track.id,
+                                path.clone(),
+                                true,
+                            ));
                         } else {
-                                        self.play_file(&entry_path, false);
+                            actions.push(FileAction::Play(path.clone(), false));
                         }
                     });
-                                self.app_state.selected_file = Some(entry_path.clone());
+                    actions.push(FileAction::SetSelected(path.clone()));
                 }
 
                 // Context menu
@@ -839,8 +966,8 @@ impl SoundpadGui {
                         ))
                         .clicked()
                     {
-                                    self.play_file(&entry_path, false);
+                        actions.push(FileAction::Play(path.clone(), false));
-                                    self.app_state.selected_file = Some(entry_path.clone());
+                        actions.push(FileAction::SetSelected(path.clone()));
                     }
 
                     if ui
@@ -851,8 +978,8 @@ impl SoundpadGui {
                         ))
                         .clicked()
                     {
-                                    self.play_file(&entry_path, true);
+                        actions.push(FileAction::Play(path.clone(), true));
-                                    self.app_state.selected_file = Some(entry_path.clone());
+                        actions.push(FileAction::SetSelected(path.clone()));
                     }
 
                     if ui
@@ -862,11 +989,10 @@ impl SoundpadGui {
                             t!("gui.context.files.replace_last")
                         ))
                         .clicked()
-                                    && let Some(last_track) = self.audio_player_state.tracks.last()
+                        && let Some(last_track) = audio_player_state.tracks.last()
                     {
-                                    self.stop(Some(last_track.id));
+                        actions.push(FileAction::StopAndPlay(last_track.id, path.clone(), true));
-                                    self.play_file(&entry_path, true);
+                        actions.push(FileAction::SetSelected(path.clone()));
-                                    self.app_state.selected_file = Some(entry_path.clone());
                     }
 
                     ui.separator();
@@ -878,7 +1004,7 @@ impl SoundpadGui {
                             t!("gui.context.files.show_in_fm")
                         ))
                         .clicked()
-                                    && let Err(e) = opener::reveal(&entry_path)
+                        && let Err(e) = opener::reveal(&path)
                     {
                         eprintln!("Failed to open file manager: {}", e);
                     }
@@ -893,33 +1019,12 @@ impl SoundpadGui {
                         ))
                         .clicked()
                     {
-                                    self.app_state.assigning_hotkey_for_file =
+                        actions.push(FileAction::AssignHotkey(path.clone()));
-                                        Some(entry_path.clone());
-                                    self.app_state.hotkey_capture_active = true;
                         ui.close();
                     }
                 });
             });
         }
-                });
-            });
-        });
-    }
-
-    fn get_hotkey_badge(&self, path: &Path) -> Option<String> {
-        for slot in &self.app_state.hotkey_config.slots {
-            if slot.action.name == "play"
-                && let Some(file_path_str) = slot.action.args.get("file_path")
-                && Path::new(file_path_str) == path
-            {
-                if let Some(chord) = &slot.key_chord {
-                    return Some(format!("[{}]", chord));
-                } else {
-                    return Some(format!("[{}]", slot.slot));
-                }
-            }
-        }
-        None
     }
 
     fn draw_footer(&mut self, ui: &mut Ui) {

src/gui/mod.rs

@@ -21,6 +21,7 @@ use pwsp::{
 };
 use rfd::FileDialog;
 use std::{
+    cmp::Ordering,
     fs,
     path::{Path, PathBuf},
     sync::{Arc, Mutex},
@@ -110,14 +111,14 @@ impl SoundpadGui {
         self.app_state.current_dir = Some(path.clone());
         match path.read_dir() {
             Ok(read_dir) => {
-                self.app_state.files = read_dir
+                self.app_state.listed_files = read_dir
                     .filter_map(|res| res.ok())
                     .map(|entry| entry.path())
                     .collect();
             }
             Err(e) => {
                 eprintln!("Failed to read directory {:?}: {}", path, e);
-                self.app_state.files.clear();
+                self.app_state.listed_files.clear();
             }
         }
     }
@@ -157,8 +158,18 @@ impl SoundpadGui {
     }
 
     pub fn get_filtered_files(&self) -> Vec<PathBuf> {
-        let mut files: Vec<PathBuf> = self.app_state.files.iter().cloned().collect();
+        let mut files: Vec<PathBuf> = self.app_state.listed_files.iter().cloned().collect();
-        files.sort();
+        files.sort_by(|a, b| {
+            let a_is_dir = a.is_dir();
+            let b_is_dir = b.is_dir();
+            if a_is_dir && !b_is_dir {
+                Ordering::Less
+            } else if !a_is_dir && b_is_dir {
+                Ordering::Greater
+            } else {
+                a.cmp(b)
+            }
+        });
 
         let search_query = self.app_state.search_query.to_lowercase();
         let search_query = search_query.trim();
@@ -167,7 +178,7 @@ impl SoundpadGui {
             .into_iter()
             .filter(|entry_path| {
                 if entry_path.is_dir() {
-                    return false;
+                    return true;
                 }
 
                 if !SUPPORTED_EXTENSIONS.contains(

src/gui/update.rs

@@ -16,7 +16,7 @@ impl App for SoundpadGui {
                 && current_dir == &path
             {
                 self.app_state.current_dir = None;
-                self.app_state.files.clear();
+                self.app_state.listed_files.clear();
             }
         }
 

src/types/gui.rs

@@ -44,14 +44,18 @@ pub struct AppState {
     pub dirs_to_remove: HashSet<PathBuf>,
 
     pub selected_file: Option<PathBuf>,
-    pub files: HashSet<PathBuf>,
+    pub listed_files: HashSet<PathBuf>,
+    pub listed_dirs: HashSet<PathBuf>,
+    pub dir_cache: HashMap<PathBuf, Vec<PathBuf>>,
 
     pub show_hotkeys: bool,
+    pub hotkey_capture_active: bool,
+
     pub hotkey_config: HotkeyConfig,
     pub hotkey_search_query: String,
+
     pub assigning_hotkey_slot: Option<String>,
     pub assigning_hotkey_for_file: Option<PathBuf>,
-    pub hotkey_capture_active: bool,
 }
 
 #[derive(Default, Debug, Clone)]