Renamed mods_folder to input_folder.

Author: MyNameIsTrez

python/convert.py

@@ -32,7 +32,7 @@ def main():
 
 	total_progress = get_total_progress()
 
-	for input_folder_path, input_subfolders, full_filename_list in os.walk(cfg.sg.user_settings_get_entry("mods_folder")):
+	for input_folder_path, input_subfolders, full_filename_list in os.walk(cfg.sg.user_settings_get_entry("input_folder")):
 		mod_subfolder = get_mod_subfolder(input_folder_path)
 		output_folder = get_output_folder_path(mod_subfolder)
 
@@ -53,23 +53,23 @@ def main():
 
 
 def unzip():
-	mods_folder = cfg.sg.user_settings_get_entry("mods_folder")
-	for f in os.listdir(mods_folder):
-		zip_path = os.path.join(mods_folder, f)
+	input_folder = cfg.sg.user_settings_get_entry("input_folder")
+	for f in os.listdir(input_folder):
+		zip_path = os.path.join(input_folder, f)
 		if zipfile.is_zipfile(zip_path):
 			with zipfile.ZipFile(zip_path) as item:
-				item.extractall(mods_folder)
+				item.extractall(input_folder)
 			os.remove(zip_path)
 
 
 def get_total_progress():
-	mods_folder = cfg.sg.user_settings_get_entry("mods_folder")
-	mod_count = len([name for name in os.listdir(mods_folder) if os.path.isdir(os.path.join(mods_folder, name))])
+	input_folder = cfg.sg.user_settings_get_entry("input_folder")
+	mod_count = len([name for name in os.listdir(input_folder) if os.path.isdir(os.path.join(input_folder, name))])
 	return mod_count * 2 if cfg.sg.user_settings_get_entry("output_zips") else mod_count
 
 
 def get_mod_subfolder(input_folder_path):
-	return input_folder_path.replace(cfg.sg.user_settings_get_entry("mods_folder") + "\\", "") # TODO: Find proper replacement for removing the \\ part that will also work for Unix.
+	return input_folder_path.replace(cfg.sg.user_settings_get_entry("input_folder") + "\\", "") # TODO: Find proper replacement for removing the \\ part that will also work for Unix.
 
 
 def get_output_folder_path(mod_subfolder):
@@ -91,8 +91,8 @@ def update_progress():
 
 
 def create_folder(input_folder_path, output_folder):
-	# Prevents putting the mods_folder itself into the output_folder.
-	if input_folder_path != cfg.sg.user_settings_get_entry("mods_folder"):
+	# Prevents putting the input_folder itself into the output_folder.
+	if input_folder_path != cfg.sg.user_settings_get_entry("input_folder"):
 		try:
 			os.makedirs(output_folder)
 		except FileExistsError:
@@ -205,9 +205,9 @@ def regex_replace_bmps_and_wavs(all_lines):
 
 
 def create_zips():
-	# Get mod folder names from the mods_folder.
+	# Get mod folder names from the input_folder.
 	output_folder = cfg.sg.user_settings_get_entry("output_folder")
-	folder_names = [f for f in os.listdir(cfg.sg.user_settings_get_entry("mods_folder")) if os.path.isdir(os.path.join(output_folder, f))]
+	folder_names = [f for f in os.listdir(cfg.sg.user_settings_get_entry("input_folder")) if os.path.isdir(os.path.join(output_folder, f))]
 
 	for f in folder_names:
 		print("Zipping '{}'".format(f))

python/gui.py

@@ -3,6 +3,7 @@
 
 import os.path, pathlib, webbrowser
 import PySimpleGUI as sg
+
 from Python import shared_globals as cfg
 from Python import convert
 
@@ -19,11 +20,11 @@ def init_window_theme():
 	sg.theme_progress_bar_color((progress_bar_color, sg.theme_progress_bar_color()[1]))
 
 
-def get_folder_containing_mods(mods_folder):
-	parts = pathlib.Path(mods_folder).parts
+def get_input_folder(input_folder):
+	parts = pathlib.Path(input_folder).parts
 	if parts[-1].endswith(".rte"):
 		return pathlib.Path(*parts[:-1]).as_posix() # .as_posix() prevents .replace() issues.
-	return mods_folder
+	return input_folder
 
 
 def init_window():
@@ -34,11 +35,11 @@ def init_window():
 		[
 			sg.Text("Folder with legacy mod(s)"),
 			sg.In(
-				sg.user_settings_get_entry("mods_folder"),
+				sg.user_settings_get_entry("input_folder"),
 				size=(25, 1),
 				enable_events=True,
-				key="-MODS FOLDER-",
-				background_color=sg.theme_input_background_color() if sg.user_settings_get_entry("mods_folder") else no_path_set_color
+				key="-INPUT FOLDER-",
+				background_color=sg.theme_input_background_color() if sg.user_settings_get_entry("input_folder") else no_path_set_color
 			),
 			sg.FolderBrowse()
 		],
@@ -105,10 +106,10 @@ def run_window(window):
 
 		# print(event, values)
 
-		if event == "-MODS FOLDER-":
-			mods_folder = values[event]
-			if mods_folder != "":
-				sg.user_settings_set_entry("mods_folder", get_folder_containing_mods(mods_folder))
+		if event == "-INPUT FOLDER-":
+			input_folder_or_file = values[event]
+			if input_folder_or_file != "":
+				sg.user_settings_set_entry("input_folder", get_input_folder(input_folder_or_file))
 				window[event](background_color=sg.theme_input_background_color())
 		elif event == "-OUTPUT FOLDER-":
 			output_folder = values[event]
@@ -120,7 +121,7 @@ def run_window(window):
 		elif event == "-PLAY FINISH SOUND-":
 			sg.user_settings_set_entry("play_finish_sound", values["-PLAY FINISH SOUND-"])
 		elif event == "-CONVERT-":
-			if sg.user_settings_get_entry("mods_folder") not in (None, "") and sg.user_settings_get_entry("output_folder") not in (None, ""):
+			if sg.user_settings_get_entry("input_folder") not in (None, "") and sg.user_settings_get_entry("output_folder") not in (None, ""):
 				convert.main()
 		elif event == "-GITHUB-":
 			webbrowser.open("https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter")