Non-Python file resources now also included in the exe which were missing so far.

Author: MyNameIsTrez

README.md

@@ -5,7 +5,7 @@
 This project automates ***most*** of the conversion work required to convert the legacy (old) `Cortex Command` mods into `Cortex Command Community Project` compatible mods.
 
 ## Getting started
-Download the [***Legacy Mod Converter***](http://www.mediafire.com/file/ckln61cmqbv2geq/Legacy_Mod_Converter.exe/file) program. Create a new folder and put your legacy mods that you want to convert in it. Run the Legacy Mod Converter program.
+Download the [***Legacy Mod Converter***](http://www.mediafire.com/file/1ncoydmaehf4nyn/Legacy_Mod_Converter.exe/file) program. Create a new folder and put your legacy mods that you want to convert in it. Run the Legacy Mod Converter program.
 
 If you get a "`Microsoft Defender SmartScreen prevented an unrecognized app from starting. Running this app might put your PC at risk.`" popup message when trying to run the program you should press `More info` and then `Run anyway`.
 

main.py

@@ -1,5 +1,7 @@
-# Run: python main.py output
-# Build: pyinstaller --noconsole --onefile --icon=media/cclmc-icon.ico --name="Legacy Mod Converter" main.py
+# Run manually: python main.py
+
+# Build exe not from spec: pyinstaller --noconsole --onefile --icon=Media/cclmc-icon.ico --add-data "Media/github-icon.png;Media" --add-data "Media/discord-icon.png;Media" --add-data "Media/finish.wav;Media" --add-data "ConversionRules;ConversionRules" --name="Legacy Mod Converter" main.py
+# Build exe from spec (can be outdated): pyinstaller "Legacy Mod Converter.spec"
 
 from Python import gui
 

python/convert.py

@@ -2,25 +2,35 @@
 from pathlib import Path
 from jsoncomment import JsonComment
 from playsound import playsound
-from Python import shared_globals as cfg
 
+from Python import shared_globals as cfg
 
-finishSoundPath = "media/finish.wav"
 
 progress = 0
 total_progress = 0
 conversion_rules = {}
 
+
+# TODO: Move to shared_globals.py
+def resource_path(relative_path):
+	if hasattr(sys, '_MEIPASS'):
+		return os.path.join(sys._MEIPASS, relative_path)
+	return os.path.join(os.path.abspath("."), relative_path)
+
+
+finishSoundPath = resource_path("Media/finish.wav")
+
+
 # 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)
 
-	for name in os.listdir("ConversionRules"):
+	for name in os.listdir(resource_path("ConversionRules")):
 		if name.endswith(".json"):
-			path = os.path.join("ConversionRules", name)
+			path = os.path.join(resource_path("ConversionRules"), name)
 			with open(path) as f:
 				conversion_rules.update(json_parser.load(f))
 
@@ -213,7 +223,6 @@ def regex_replace_bmps_and_wavs(all_lines):
 
 
 def create_zips(input_folder, output_folder):
-	print(input_folder)
 	if input_folder.endswith(".rte"):
 		create_single_zip(Path(input_folder).name, output_folder)
 	else:

python/gui.py

@@ -1,3 +1,4 @@
+import os, sys
 import os.path, pathlib, webbrowser
 import PySimpleGUI as sg
 
@@ -8,6 +9,13 @@
 sg.user_settings_filename(filename="settings.json", path=".")
 
 
+# TODO: Move to shared_globals.py
+def resource_path(relative_path):
+	if hasattr(sys, '_MEIPASS'):
+		return os.path.join(sys._MEIPASS, relative_path)
+	return os.path.join(os.path.abspath("."), relative_path)
+
+
 def init_window_theme():
 	path_set_color = "#528b30"
 	progress_bar_color = "#17569c"
@@ -51,8 +59,8 @@ def init_window():
 	info_column = [
 		[sg.Frame(layout=[
 		[
-			sg.Image("media/github-icon.png", enable_events=True, key="-GITHUB-", tooltip=" Visit this program's GitHub page ", size=(0, 30)),
-			sg.Image("media/discord-icon.png", enable_events=True, key="-DISCORD-", tooltip=" Visit the CCCP Discord server for help ", size=(0, 30))
+			sg.Image(resource_path("media/github-icon.png"), enable_events=True, key="-GITHUB-", tooltip=" Visit this program's GitHub page ", size=(0, 30)),
+			sg.Image(resource_path("media/discord-icon.png"), enable_events=True, key="-DISCORD-", tooltip=" Visit the CCCP Discord server for help ", size=(0, 30))
 		]
 		], title="", pad=((9, 0), (8, 0)))]
 	]
@@ -68,7 +76,7 @@ def init_window():
 	]
 
 	cfg.sg = sg
-	window = sg.Window("Legacy Mod Converter - v1.0", layout, icon="media/cclmc-icon.ico", button_color=(sg.theme_text_color(), "#2a3948"))
+	window = sg.Window("Legacy Mod Converter - v1.0", layout, icon=resource_path("media/cclmc-icon.ico"), button_color=(sg.theme_text_color(), "#2a3948"))
 	cfg.progress_bar = window["-PROGRESS BAR-"]
 
 	return window