Run stylua when converting

Author: MyNameIsTrez

Lib/stylua/Linux/stylua

@@ -11,6 +11,7 @@
 from Python import warnings
 from Python.case_check import case_check
 from Python import utils
+from Python import stylua
 
 from Python.ini_converting import ini_cst_builder
 from Python.ini_converting import ini_rules
@@ -23,13 +24,12 @@
 
 
 def convert():
-	print("") # Just prints a newline.
-
-	output_folder_path = sg.user_settings_get_entry("cccp_folder")
+	print("") # Newline.
 
 	time_start = time.time()
 
 	input_folder_path = cfg.sg.user_settings_get_entry("input_folder")
+	output_folder_path = sg.user_settings_get_entry("cccp_folder")
 	cccp_folder_path = cfg.sg.user_settings_get_entry("cccp_folder")
 
 	zips_py.unzip(input_folder_path)
@@ -40,6 +40,8 @@ def convert():
 
 	converter_walk(input_folder_path, output_folder_path)
 
+	stylua.run(input_folder_path, output_folder_path)
+
 	ini_cst = ini_cst_builder.get_ini_cst(input_folder_path, output_folder_path, input_folder_path)
 	ini_rules.apply_rules_on_ini_cst(ini_cst)
 	ini_writer.write_converted_ini_cst(ini_cst, Path(output_folder_path))
@@ -50,7 +52,6 @@ def convert():
 	if cfg.sg.user_settings_get_entry("play_finish_sound"):
 		playsound(utils.resource_path("Media/finish.wav"), block=(platform.system() == "Linux"))
 
-
 	elapsed = math.floor(time.time() - time_start)
 	print(f"Finished in {elapsed} {pluralize('second', elapsed)}.")
 
@@ -151,4 +152,4 @@ def apply_conversion_rules(all_lines):
 
 
 def pluralize(word, count):
-	return word + "s" if count != 1 else word
+	return word + "s" if count != 1 else word

Lib/stylua/Windows/stylua.exe

@@ -19,7 +19,7 @@ def get_ini_cst(input_folder_path, output_folder_path, subfolder_path):
 		if not utils.is_mod_folder_or_subfolder(relative_subfolder): # TODO: Remove this once CCCP has a Mods folder that can be iterated over.
 			continue
 		elif p.is_file() and p.suffix == ".ini" and p.stem != "desktop": # Skip the desktop.ini Windows metadata file.
-			output_file_path = utils.get_output_file_path_from_input_file_path(input_folder_path, output_folder_path, p)
+			output_file_path = utils.get_output_path_from_input_path(input_folder_path, output_folder_path, p)
 			tokens = ini_tokenizer.get_tokens(output_file_path)
 			parsed_portion[name] = ini_parser.get_parsed_tokens(tokens)
 		elif p.is_dir():

Python/convert.py

@@ -0,0 +1,30 @@
+import os, subprocess
+
+from pathlib import Path
+
+
+from Python import utils
+
+
+class WronglyFormattedLuaFile(Exception):
+	pass
+
+
+def run(input_folder_path, output_folder_path):
+	for name in os.listdir(input_folder_path):
+		input_path = input_folder_path / Path(name)
+		if not utils.is_mod_folder(input_path):
+			continue
+		
+		output_path = utils.get_output_path_from_input_path(input_folder_path, output_folder_path, input_path)
+
+		if os.name == "nt": # If the OS is Windows
+			stylua_path = utils.resource_path("Lib/stylua/Windows/stylua.exe")
+		elif os.name == "posix": # If the OS is Linux
+			stylua_path = utils.resource_path("Lib/stylua/Linux/stylua")
+
+		result = subprocess.run([stylua_path, output_path], capture_output=True, text=True)
+		
+		if result.stderr:
+			raise WronglyFormattedLuaFile(result.stderr)
+		

Python/ini_converting/ini_cst_builder.py

@@ -18,9 +18,7 @@ def get_relative_subfolder(input_folder_path, input_subfolder_path):
 
 
 def is_mod_folder(path):
-	path_parts = Path(path).parts
-	# If it is a folder inside of the input folder and if it is the mod folder.
-	return len(path_parts) == 1 and path_parts[0].endswith(".rte")
+	return path.suffix == ".rte"
 
 
 def is_mod_folder_or_subfolder(path):
@@ -29,6 +27,6 @@ def is_mod_folder_or_subfolder(path):
 	return len(path_parts) >= 1 and path_parts[0].endswith(".rte")
 
 
-def get_output_file_path_from_input_file_path(input_folder_path, output_folder_path, p):
+def get_output_path_from_input_path(input_folder_path, output_folder_path, p):
 	relative = p.relative_to(input_folder_path)
 	return str(output_folder_path / relative)