From 05cd0470dd4660d7a71a6eea08b5ae3d71cb843f Mon Sep 17 00:00:00 2001
From: Brett Williams <williams.brett@apple.com>
Date: Thu, 13 Mar 2025 14:17:50 -0500
Subject: [PATCH] Fix build issues using pyinstaller

---
 main.spec                    | 4 +++-
 requirements.txt             | 3 +++
 src/api/api_server.py        | 2 +-
 src/init.py                  | 3 +--
 src/ui/about_window.py       | 2 +-
 src/ui/main_window.py        | 3 +--
 src/ui/widgets/menubar.py    | 2 +-
 version.py => src/version.py | 0
 8 files changed, 11 insertions(+), 8 deletions(-)
 rename version.py => src/version.py (100%)

diff --git a/main.spec b/main.spec
index c0bb049..f351144 100644
--- a/main.spec
+++ b/main.spec
@@ -5,8 +5,10 @@ from PyInstaller.utils.hooks import collect_all
 import os
 import sys
 import platform
-sys.path.insert(0, os.path.abspath('.'))
+src_path = os.path.abspath("src")
+sys.path.insert(0, src_path)
 from version import APP_NAME, APP_VERSION, APP_AUTHOR
+sys.path.insert(0, os.path.abspath('.'))
 
 datas = [('resources', 'resources'), ('src/engines/blender/scripts/', 'src/engines/blender/scripts')]
 binaries = []
diff --git a/requirements.txt b/requirements.txt
index a3f2f29..512050a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -36,3 +36,6 @@ lxml>=5.1.0
 click>=8.1.7
 requests_toolbelt>=1.0.0
 pyinstaller_versionfile>=2.1.1
+py-cpuinfo~=9.0.0
+requests-toolbelt~=1.0.0
+ifaddr~=0.2.0
\ No newline at end of file
diff --git a/src/api/api_server.py b/src/api/api_server.py
index 93eede3..878dd57 100755
--- a/src/api/api_server.py
+++ b/src/api/api_server.py
@@ -26,7 +26,7 @@ from src.utilities.config import Config
 from src.utilities.misc_helper import system_safe_path, current_system_os, current_system_cpu, \
     current_system_os_version, num_to_alphanumeric
 from src.utilities.status_utils import string_to_status
-from version import APP_VERSION
+from src.version import APP_VERSION
 
 logger = logging.getLogger()
 server = Flask(__name__)
diff --git a/src/init.py b/src/init.py
index 66a06f6..eab1b5e 100644
--- a/src/init.py
+++ b/src/init.py
@@ -1,7 +1,6 @@
 import logging
 import multiprocessing
 import os
-import platform
 import socket
 import sys
 import threading
@@ -20,7 +19,7 @@ from src.utilities.config import Config
 from src.utilities.misc_helper import (system_safe_path, current_system_cpu, current_system_os,
                                        current_system_os_version, check_for_updates)
 from src.utilities.zeroconf_server import ZeroconfServer
-from version import APP_NAME, APP_VERSION, APP_REPO_NAME, APP_REPO_OWNER
+from src.version import APP_NAME, APP_VERSION, APP_REPO_NAME, APP_REPO_OWNER
 
 logger = logging.getLogger()
 
diff --git a/src/ui/about_window.py b/src/ui/about_window.py
index 674c1fd..1f095c2 100644
--- a/src/ui/about_window.py
+++ b/src/ui/about_window.py
@@ -5,7 +5,7 @@ from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtWidgets import QDialog, QVBoxLayout, QLabel, QDialogButtonBox, QHBoxLayout
 
-from version import *
+from src.version import *
 
 
 class AboutDialog(QDialog):
diff --git a/src/ui/main_window.py b/src/ui/main_window.py
index b4b91bb..787b3f3 100644
--- a/src/ui/main_window.py
+++ b/src/ui/main_window.py
@@ -3,7 +3,6 @@ import datetime
 import io
 import logging
 import os
-import subprocess
 import sys
 import threading
 import time
@@ -31,7 +30,7 @@ from src.ui.widgets.statusbar import StatusBar
 from src.ui.widgets.toolbar import ToolBar
 from src.api.serverproxy_manager import ServerProxyManager
 from src.utilities.misc_helper import launch_url, iso_datestring_to_formatted_datestring
-from version import APP_NAME
+from src.version import APP_NAME
 
 logger = logging.getLogger()
 
diff --git a/src/ui/widgets/menubar.py b/src/ui/widgets/menubar.py
index 5b061d6..71df80d 100644
--- a/src/ui/widgets/menubar.py
+++ b/src/ui/widgets/menubar.py
@@ -60,7 +60,7 @@ class MenuBar(QMenuBar):
     @staticmethod
     def check_for_updates():
         from src.utilities.misc_helper import check_for_updates
-        from version import APP_NAME, APP_VERSION, APP_REPO_NAME, APP_REPO_OWNER
+        from src.version import APP_NAME, APP_VERSION, APP_REPO_NAME, APP_REPO_OWNER
         found_update = check_for_updates(APP_REPO_NAME, APP_REPO_OWNER, APP_NAME, APP_VERSION)
         if found_update:
             dialog = UpdateDialog(found_update, APP_VERSION)
diff --git a/version.py b/src/version.py
similarity index 100%
rename from version.py
rename to src/version.py