csd4ni3l/soundboard
1
0
Fork 0
mirror of https://github.com/csd4ni3l/soundboard.git synced 2026-03-10 17:19:24 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

rename FileData to AppState, fix system not having a mutable pointer, add file buttons, current directory

Browse Source
This commit is contained in:
csd4ni3l
2026-01-21 17:29:26 +01:00
parent 612c8ccfa5
commit baf348117b
1 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main.rs
View File

@@ -16,9 +16,10 @@ struct JSONData {
} }
#[derive(Resource)] #[derive(Resource)]
struct FileData { struct AppState {
loaded_files: HashMap<String, Vec<String>>, loaded_files: HashMap<String, Vec<String>>,
json_data: JSONData, json_data: JSONData,
current_directory: String
} }
fn main() { fn main() {
@@ -41,15 +42,16 @@ fn main() {
}), }),
) )
.add_plugins(EguiPlugin::default()) .add_plugins(EguiPlugin::default())
.insert_resource(FileData { .insert_resource(AppState {
loaded_files: HashMap::new(), loaded_files: HashMap::new(),
json_data: JSONData { tabs: Vec::new() }, json_data: JSONData { tabs: Vec::new() },
current_directory: String::new()
}) })
.add_systems( .add_systems(
PreStartup, PreStartup,
setup_camera_system.before(EguiStartupSet::InitContexts), setup_camera_system.before(EguiStartupSet::InitContexts),
) )
.add_systems(Startup, load_json_system) .add_systems(Startup, load_system)
.add_systems( .add_systems(
EguiPrimaryContextPass, EguiPrimaryContextPass,
(ui_system, update_ui_scale_factor_system), (ui_system, update_ui_scale_factor_system),
@@ -57,18 +59,26 @@ fn main() {
.run(); .run();
} }
fn load_json_system(mut file_data: ResMut<FileData>) { fn load_system(mut app_state: ResMut<AppState>) {
load_data(&mut app_state);
}
fn load_data(app_state: &mut AppState) {
if std::fs::exists("data.json").expect("Failed to check existence of JSON file") { if std::fs::exists("data.json").expect("Failed to check existence of JSON file") {
let data = std::fs::read_to_string("data.json").expect("Failed to read JSON"); let data = std::fs::read_to_string("data.json").expect("Failed to read JSON");
file_data.json_data = serde_json::from_str(&data).expect("Failed to load JSON"); app_state.json_data = serde_json::from_str(&data).expect("Failed to load JSON");
let tabs = file_data.json_data.tabs.clone(); let tabs = app_state.json_data.tabs.clone();
file_data.loaded_files.clear(); app_state.loaded_files.clear();
if tabs.length() > 0 {
app_state.current_directory = tabs[0].clone();
}
for tab in tabs { for tab in tabs {
file_data.loaded_files.insert(tab.clone(), Vec::new()); app_state.loaded_files.insert(tab.clone(), Vec::new());
if std::fs::exists(tab.clone()).expect("Failed to check existence of tab directory.") { if std::fs::exists(tab.clone()).expect("Failed to check existence of tab directory.") {
file_data.loaded_files.insert( app_state.loaded_files.insert(
tab.clone(), tab.clone(),
std::fs::read_dir(tab) std::fs::read_dir(tab)
.expect("Failed to read directory") .expect("Failed to read directory")
@@ -111,7 +121,7 @@ fn update_ui_scale_factor_system(
} }
} }
fn ui_system(mut contexts: EguiContexts, mut file_data: ResMut<FileData>) -> Result { fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Result {
let ctx = contexts.ctx_mut()?; let ctx = contexts.ctx_mut()?;
egui::TopBottomPanel::top("top_panel").show(ctx, |ui| { egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
@@ -120,6 +130,20 @@ fn ui_system(mut contexts: EguiContexts, mut file_data: ResMut<FileData>) -> Res
egui::CentralPanel::default().show(ctx, |ui| { egui::CentralPanel::default().show(ctx, |ui| {
ui.label("The app!"); ui.label("The app!");
if app_state.current_directory.chars().count() > 0 {
if let Some(files) = app_state.loaded_files.get(&app_state.current_directory) {
for element in files {
if let Some(filename) = element.split("/").collect::<Vec<_>>().last() {
if ui.add_sized(
[ui.available_width(), 40.0],
egui::Button::new(*filename),
).clicked() {
println!("{:?}", filename);
}
}
}
}
}
}); });
egui::SidePanel::right("tools").show(ctx, |ui| { egui::SidePanel::right("tools").show(ctx, |ui| {
@@ -137,14 +161,14 @@ fn ui_system(mut contexts: EguiContexts, mut file_data: ResMut<FileData>) -> Res
if let Some(folder) = rfd::FileDialog::new().pick_folder() { if let Some(folder) = rfd::FileDialog::new().pick_folder() {
if let Some(path_str) = folder.to_str() { if let Some(path_str) = folder.to_str() {
println!("Selected: {}", path_str); println!("Selected: {}", path_str);
file_data.json_data.tabs.push(path_str.to_string()); app_state.json_data.tabs.push(path_str.to_string());
std::fs::write( std::fs::write(
"data.json", "data.json",
serde_json::to_string(&file_data.json_data) serde_json::to_string(&app_state.json_data)
.expect("Could not convert JSON to string"), .expect("Could not convert JSON to string"),
) )
.expect("Could not write to JSON file"); .expect("Could not write to JSON file");
load_json_system(file_data); load_data(&mut app_state);
} else { } else {
println!("Invalid path encoding!"); println!("Invalid path encoding!");
} }
@@ -158,7 +182,7 @@ fn ui_system(mut contexts: EguiContexts, mut file_data: ResMut<FileData>) -> Res
) )
.clicked() .clicked()
{ {
load_json_system(file_data); load_data(&mut app_state);
println!("Reloaded content"); println!("Reloaded content");
} }