From 2589c7fc3d18bf0e7ecf640f34aa11f519a0e74c Mon Sep 17 00:00:00 2001 From: Arthur Roberts Date: Sun, 24 Dec 2023 17:00:39 +0000 Subject: [PATCH] Changed to filenames --- src/main.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index d318910..f9fd3e7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -69,16 +69,17 @@ impl Default for RustDoomLauncher { fn is_wad_file(entry: &DirEntry) -> bool { let filename = entry.file_name().to_str().unwrap().to_lowercase(); println!("{} - > {}", filename, filename.ends_with("wad")); - filename.ends_with("wad") + filename.ends_with("wad") || filename.ends_with("pk3") } fn get_wads_in_folder(path: &PathBuf) -> Vec { let mut wads = Vec::new(); - for entry in WalkDir::new(path) { + for entry in WalkDir::new(path).max_depth(2) { let entry = entry.unwrap(); if is_wad_file(&entry) { + wads.push(WadInfo { - name: format!("{}", entry.path().display()), + name: format!("{}", entry.path().file_name().unwrap().to_str().unwrap()), path: entry.path().to_path_buf(), info_text: None, }) @@ -267,16 +268,19 @@ impl eframe::App for RustDoomLauncher { } }); } + /* if let Some(rp) = remove_pos { self.pwad_manager.remove_selectable(rp); self.command_manager .add_pwads(&self.pwad_manager.get_current()) } + */ if let Some(ap) = add_pos { self.pwad_manager.set_current(ap); self.command_manager .add_pwads(&self.pwad_manager.get_current()) } + }); }); ui.separator();