Exe now outputs to "..", shell outputs to "Output".

Author: MyNameIsTrez

main.py

@@ -1,3 +1,6 @@
+# Run: python main.py output
+# Build: pyinstaller --noconsole --onefile --icon=media/cclmc-icon.ico --name="Legacy Mod Converter" main.py
+
 from Python import gui
 
 gui.init_window_theme()

python/convert.py

@@ -10,6 +10,9 @@
 total_progress = 0
 conversion_rules = {}
 
+# If an exe executes this program then sys is frozen.
+output_folder = ".." if getattr(sys, 'frozen', False) else "Output"
+
 
 def	load_conversion_rules():
 	json_parser = JsonComment(json)
@@ -23,8 +26,8 @@ def	load_conversion_rules():
 load_conversion_rules()
 
 
-def main():
-	global progress, total_progress
+def convert():
+	global progress, total_progress, output_folder
 
 	time_start = time.time()
 
@@ -34,14 +37,14 @@ def main():
 
 	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)
+		output_subfolder = os.path.join(output_folder, mod_subfolder)
 
 		try_print_mod_name(mod_subfolder)
-		create_folder(input_folder_path, output_folder)
-		process_file(full_filename_list, input_folder_path, output_folder)
+		create_folder(input_folder_path, output_subfolder)
+		process_file(full_filename_list, input_folder_path, output_subfolder)
 
 	if cfg.sg.user_settings_get_entry("output_zips"):
-		create_zips()
+		create_zips(output_folder)
 
 	progress = 0
 	total_progress = 0
@@ -72,10 +75,6 @@ def get_mod_subfolder(input_folder_path):
 	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):
-	return os.path.join(cfg.sg.user_settings_get_entry("output_folder"), mod_subfolder)
-
-
 def try_print_mod_name(mod_subfolder):
 	input_folder_path_tuple = pathlib.Path(mod_subfolder).parts
 
@@ -204,9 +203,8 @@ def regex_replace_bmps_and_wavs(all_lines):
 	return all_lines
 
 
-def create_zips():
+def create_zips(output_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("input_folder")) if os.path.isdir(os.path.join(output_folder, f))]
 
 	for f in folder_names:
@@ -218,8 +216,4 @@ def create_zips():
 
 
 def pluralize(word, count):
-	return word + "s" if count != 1 else word
-
-
-if __name__ == "__main__":
-    main()
+	return word + "s" if count != 1 else word

python/gui.py

@@ -1,6 +1,3 @@
-# Run: python gui.py
-# Build: pyinstaller --noconsole --onefile --icon=media/cclmc-icon.ico --name="Legacy Mod Converter" main.py
-
 import os.path, pathlib, webbrowser
 import PySimpleGUI as sg
 
@@ -33,26 +30,15 @@ def init_window():
 	paths_column = [
 		[sg.Frame(layout=[
 		[
-			sg.Text("Folder with legacy mod(s)"),
+			sg.Text("Mod to convert"),
 			sg.In(
 				sg.user_settings_get_entry("input_folder"),
-				size=(25, 1),
+				size=(34, 1),
 				enable_events=True,
 				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()
-		],
-		[
-			sg.Text("Output CCCP folder"),
-			sg.In(
-				sg.user_settings_get_entry("output_folder"),
-				size=(25, 1),
-				enable_events=True,
-				key="-OUTPUT FOLDER-",
-				background_color=sg.theme_input_background_color() if sg.user_settings_get_entry("output_folder") else no_path_set_color
-			),
-			sg.FolderBrowse()
 		]
 		], title="Paths", element_justification="right")]
 	]
@@ -67,14 +53,14 @@ def init_window():
 	run_column = [
 		[sg.Frame(layout=[
 			[sg.Button("Convert", key="-CONVERT-")],
-			[sg.ProgressBar(100, size=(17.45, 20), key="-PROGRESS BAR-")]
+			[sg.ProgressBar(100, size=(17.4, 20), key="-PROGRESS BAR-")]
 		], title="Run", element_justification="center")]
 	]
 
 	info_column = [
 		[sg.Frame(layout=[
-			[sg.Image("media/github-icon.png", enable_events=True, key="-GITHUB-")],
-			[sg.Image("media/discord-icon.png", enable_events=True, key="-DISCORD-")]
+			[sg.Image("media/github-icon.png", enable_events=True, key="-GITHUB-", tooltip=" Visit this program's GitHub page ")],
+			[sg.Image("media/discord-icon.png", enable_events=True, key="-DISCORD-", tooltip=" Visit the CCCP Discord server ")]
 		], title="", pad=(0, (8, 0)))]
 	]
 
@@ -110,19 +96,17 @@ def run_window(window):
 			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]
-			if output_folder != "":
-				sg.user_settings_set_entry("output_folder", output_folder)
-				window[event](background_color=sg.theme_input_background_color())
+				window[event](background_color = sg.theme_input_background_color())
+		
 		elif event == "-OUTPUT ZIPS-":
 			sg.user_settings_set_entry("output_zips", values["-OUTPUT ZIPS-"])
 		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("input_folder") not in (None, "") and sg.user_settings_get_entry("output_folder") not in (None, ""):
-				convert.main()
+			if sg.user_settings_get_entry("input_folder") not in (None, ""):
+				convert.convert()
+		
 		elif event == "-GITHUB-":
 			webbrowser.open("https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter")
 		elif event == "-DISCORD-":