main.rs cleanup

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() {
+    let settings_yaml = load_yaml_folder(settings_yaml_default, Path::new("./data/settings"));
-        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_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 {