From 5f72edba9601783f8911e7650376c4a97f0506ee Mon Sep 17 00:00:00 2001
From: Johannes Hendrik Gerard van der Weide <hertog@fsfe.org>
Date: Tue, 12 Dec 2023 17:41:34 +0100
Subject: [PATCH] main.rs cleanup

---
 data/{ => settings}/settings.yml |  0
 src/main.rs                      | 17 ++++++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)
 rename data/{ => settings}/settings.yml (100%)

diff --git a/data/settings.yml b/data/settings/settings.yml
similarity index 100%
rename from data/settings.yml
rename to data/settings/settings.yml
diff --git a/src/main.rs b/src/main.rs
index b9308c4..e60b1ca 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 use player::PlayerPlugin;
 use serde::{Deserialize, Serialize};
-use std::fs;
 use std::path::Path;
 use crate::player::Player;
+use crate::setup::config_loader::load_yaml_folder;
 
 #[derive(Component, Serialize, Deserialize)]
 pub struct Settings {
@@ -51,7 +51,7 @@ fn main() {
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands.spawn(Camera2dBundle::default());
 
-    let mut settings_yaml: String = "
+    let settings_yaml_default: String = "
         # Change these to whatever you want
         up: W
         down: S
@@ -68,16 +68,11 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
         ]        
     "
     .to_string();
-    let settings_file = Path::new("./data/settings.yml");
-    if settings_file.exists() {
-        settings_yaml =
-            fs::read_to_string("./data/settings.yml").expect("Error reading data/settings.yml");
-    } else {
-        fs::write("./data/settings.yml", settings_yaml.clone())
-            .expect("Error writing data/settings.yml");
-    }
+    
+    let settings_yaml = load_yaml_folder(settings_yaml_default, Path::new("./data/settings"));
+    
     let settings_data =
-        serde_yaml::from_str::<Settings>(&settings_yaml).expect("Error serializing to YAML");
+        serde_yaml::from_str::<Settings>(&settings_yaml[0]).expect("Error serializing to YAML");
 
     commands.spawn((
         SpriteBundle {