fixed the user input issue

Author: Vort3xed

.gitignore

@@ -1 +1 @@
-node_modules/
+node_modules/

__pycache__/app_utilities.cpython-310.pyc

@@ -36,9 +36,10 @@ def savehome():
 		saved_text = request.form['hometext']
 		# sanitized_text = saved_text.replace('','\n')
 		# overwrite_file(str(SELECTED_COMP)+'/Home.md',saved_text)
+		sanitized_text = saved_text.replace('\r\n', '\n').replace('\r', '\n')  # Replace different newline formats
 		print(saved_text)
 		print(saved_text.count('\n'))
-		overwrite_file(os.path.join('competitions',str(SELECTED_COMP),'Home.md'),saved_text)
+		overwrite_file(os.path.join('competitions',str(SELECTED_COMP),'Home.md'),sanitized_text)
 	return redirect(url_for('edithome'))
 
 @app.route("/selectcomp", methods=('GET', 'POST'))
@@ -90,5 +91,17 @@ def get_home():
 		return extract_text('competitions/'+str(SELECTED_COMP),'Home.md')
 	return dict(get_home=get_home)
 
+@app.context_processor
+def utility_processor():
+	def get_all_environments():
+		return get_all_environments()
+	return dict(get_all_environments=get_all_environments)
+
+@app.context_processor
+def utility_processor():
+	def get_environments():
+		return get_environments(SELECTED_COMP)
+	return dict(get_environments=get_environments)
+
 if __name__ == '__main__':
 	app.run(debug=True)

app.py

@@ -1,5 +1,6 @@
 import os
 import ruamel.yaml
+import json
 
 # Creates a folder anywhere in the chalgen-online folder, paths deeper must be specified
 def create_folder(name):
@@ -85,4 +86,26 @@ def overwrite_file(dir,text):
         pass
     create_file(os.path.join(current_directory,dir),text)
 
+def get_all_environments():
+    with open(os.path.join(os.getcwd(),'usable_chals.json'),'r') as file:
+        data = json.load(file)
+    return data['environments']
+
+def get_environments(comp_name):
+    directory = os.path.join(os.getcwd(),'competitions',comp_name,'chals')
+
+    all_environments = get_all_environments()
+    
+    all_folders = [item for item in os.listdir(directory) if os.path.isdir(os.path.join(directory, item))]
+
+    existing_environments = []
+    
+    for folder in all_folders:
+        if folder in all_environments:
+            existing_environments.append(folder)
+    
+    return existing_environments
+
+print(get_environments('mcpshsf2024'))
+
 # print(extract_text('competitions'+'/KhetarKoinCompetition','Home.md'))

app_utilities.py

@@ -1,9 +1,3 @@
-hi
-
-
-
-
-
-
-
-hi
+test
+
+sfsef

competitions/KhetarKoinCompetition/Home.md

@@ -149,6 +149,7 @@ <h1 class="pt-2">Selected Comp: {{ get_selected_comp() }}</h1>
                      <option value="Fesbuc">Fesbuc</option>
                      <option value="Tweepy">Tweepy</option>
                      <option value="Fileserver">File Server</option>
+                     <!-- TODO: make it so that all addable envs are read from the json and are added here -->
                   </select>
                   <div class="relative">
                      <button type="submit"

competitions/mcpshsf2024/chals/CaesarCipher/chal.yaml

@@ -1,7 +1,13 @@
 {
-    "environments": ["Fesbuc","Tweepy","File Share"],
+    "environments": [
+        "Fesbuc",
+        "Tweepy",
+        "FileShare"
+    ],
     "challenges": [
-        "test1",
-        "test2"
+        "CaesarCipher",
+        "Base64",
+        "VigenereCipher",
+        "DocxCarving"
     ]
 }