Add and use get_output_file_path_from_input_file_path() for get_ini_cst()

Author: MyNameIsTrez

Python/convert.py

@@ -42,7 +42,7 @@ def convert():
 
 	converter_walk(input_folder_path, output_folder_path)
 
-	ini_cst = ini_cst_builder.get_ini_cst(input_folder_path, input_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))
 
@@ -63,7 +63,7 @@ def converter_walk(input_folder_path, output_folder_path):
 	for input_subfolder_path, input_subfolders, input_subfiles in os.walk(input_folder_path):
 		relative_subfolder = utils.get_relative_subfolder(input_folder_path, input_subfolder_path)
 
-		if is_mod_folder(relative_subfolder):
+		if utils.is_mod_folder(relative_subfolder):
 			warnings.clear_mod_warnings()
 
 		if utils.is_mod_folder_or_subfolder(relative_subfolder):
@@ -72,12 +72,6 @@ def converter_walk(input_folder_path, output_folder_path):
 			process_files(input_subfiles, input_subfolder_path, output_subfolder, input_folder_path, output_folder_path)
 
 
-def is_mod_folder(relative_subfolder):
-	# If it isn't the input folder and if it's the rte folder.
-	mod_subfolder_parts = utils.get_mod_subfolder_parts(relative_subfolder)
-	return len(mod_subfolder_parts) == 1 and mod_subfolder_parts[0].endswith(".rte")
-
-
 def create_folder(input_subfolder_path, output_subfolder):
 	try:
 		os.makedirs(output_subfolder)

Python/ini_converting/ini_cst_builder.py

@@ -6,7 +6,7 @@
 from Python.ini_converting import ini_parser
 
 
-def get_ini_cst(input_folder_path, subfolder_path):
+def get_ini_cst(input_folder_path, output_folder_path, subfolder_path):
 	"""
 	The "cst" in this function's name stands for Concrete Syntax Tree.
 	"""
@@ -19,9 +19,10 @@ def get_ini_cst(input_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.
-			tokens = ini_tokenizer.get_tokens(str(p))
+			output_file_path = utils.get_output_file_path_from_input_file_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():
-			parsed_portion[name] = get_ini_cst(input_folder_path, str(p))
+			parsed_portion[name] = get_ini_cst(input_folder_path, output_folder_path, str(p))
 
 	return parsed_portion

Python/ini_converting/ini_writer.py

@@ -1,9 +1,8 @@
 def write_converted_ini_cst(parsed_portion, output_folder_path):
-	# pprint.pprint(parsed_portion)
 	for name, dict_or_list in parsed_portion.items():
 		if isinstance(dict_or_list, dict): # If dict_or_list contains a dictionary of more filenames.
 			write_converted_ini_cst(dict_or_list, output_folder_path / name)
-		else: # If dict_or_list contains a list of the sections of a file.
+		else: # Else dict_or_list contains a list of the sections of a file.
 			with open(str(output_folder_path / name), mode="w") as f:
 				lines = []
 				for section in dict_or_list:
@@ -17,4 +16,4 @@ def write_recursively(line_tokens, lines):
 			lines.append(token["content"])
 		elif token["type"] == "children":
 			for line_tokens in token["content"]:
-				write_recursively(line_tokens, lines)
+				write_recursively(line_tokens, lines)

Python/utils.py

@@ -17,11 +17,18 @@ def get_relative_subfolder(input_folder_path, input_subfolder_path):
 	return os.path.relpath(input_subfolder_path, os.path.join(input_folder_path, os.pardir) if input_folder_path.endswith(".rte") else input_folder_path)
 
 
-def is_mod_folder_or_subfolder(mod_subfolder):
-	mod_subfolder_parts = get_mod_subfolder_parts(mod_subfolder)
-	# If it isn't the input folder and if it's (in) the rte folder.
-	return len(mod_subfolder_parts) > 0 and mod_subfolder_parts[0].endswith(".rte")
+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")
 
 
-def get_mod_subfolder_parts(mod_subfolder):
-	return Path(mod_subfolder).parts
+def is_mod_folder_or_subfolder(path):
+	path_parts = Path(path).parts
+	# If it is a folder inside of the input folder and if it is the mod folder or is inside of it.
+	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):
+	relative = p.relative_to(input_folder_path)
+	return str(output_folder_path / relative)