From ef8af7d6185b2a30225c249c755238df41244352 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@legendserver.info>
Date: Mon, 11 Oct 2021 21:37:08 -0400
Subject: [PATCH] Move config files and player-settings js files to
 /generated/configs and /generated/player-settings and update the pages that
 use them

---
 WebHostLib/options.py                       | 10 ++++++++--
 WebHostLib/static/assets/player-settings.js |  2 +-
 WebHostLib/templates/player-settings.html   |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WebHostLib/options.py b/WebHostLib/options.py
index f3c50ae35b..9c23242ff8 100644
--- a/WebHostLib/options.py
+++ b/WebHostLib/options.py
@@ -32,7 +32,10 @@ def create():
             dictify_range=dictify_range, default_converter=default_converter,
         )
 
-        with open(os.path.join(target_folder, game_name + ".yaml"), "w") as f:
+        if not os.path.isdir(os.path.join(target_folder, 'configs')):
+            os.mkdir(os.path.join(target_folder, 'configs'))
+
+        with open(os.path.join(target_folder, 'configs', game_name + ".yaml"), "w") as f:
             f.write(res)
 
         # Generate JSON files for player-settings pages
@@ -78,5 +81,8 @@ def create():
 
         player_settings["gameOptions"] = game_options
 
-        with open(os.path.join(target_folder, game_name + ".json"), "w") as f:
+        if not os.path.isdir(os.path.join(target_folder, 'player-settings')):
+            os.mkdir(os.path.join(target_folder, 'player-settings'))
+
+        with open(os.path.join(target_folder, 'player-settings', game_name + ".json"), "w") as f:
             f.write(json.dumps(player_settings, indent=2, separators=(',', ': ')))
diff --git a/WebHostLib/static/assets/player-settings.js b/WebHostLib/static/assets/player-settings.js
index bd1f2a2748..e039e8c099 100644
--- a/WebHostLib/static/assets/player-settings.js
+++ b/WebHostLib/static/assets/player-settings.js
@@ -61,7 +61,7 @@ const fetchSettingData = () => new Promise((resolve, reject) => {
     try{ resolve(JSON.parse(ajax.responseText)); }
     catch(error){ reject(error); }
   };
-  ajax.open('GET', `${window.location.origin}/static/generated/${gameName}.json`, true);
+  ajax.open('GET', `${window.location.origin}/static/generated/player-settings/${gameName}.json`, true);
   ajax.send();
 });
 
diff --git a/WebHostLib/templates/player-settings.html b/WebHostLib/templates/player-settings.html
index c142d17af2..18dc9032f3 100644
--- a/WebHostLib/templates/player-settings.html
+++ b/WebHostLib/templates/player-settings.html
@@ -21,7 +21,7 @@
             A list of all games you have generated can be found <a href="/user-content">here</a>.
             <br />
             Advanced users can download a template file for this game
-            <a href="/static/generated/{{ game }}.yaml">here</a>.
+            <a href="/static/generated/configs/{{ game }}.yaml">here</a>.
         </p>
 
         <p><label for="player-name">Please enter your player name. This will appear in-game as you send and receive