From d41fc149b2d0a72c64bb0347f1fce8bc32f35bf3 Mon Sep 17 00:00:00 2001
From: Mohamed <110548351+oop7@users.noreply.github.com>
Date: Sun, 25 Jan 2026 14:33:48 +0200
Subject: [PATCH] Update macOS build workflow for pyproject and new structure

Switches dependency installation from requirements.txt to pyproject.toml and updates pip cache key accordingly. Refactors cx_Freeze setup to use a new entry point, adjusts included files and paths to match the updated project structure, and updates icon file references.
---
 .github/workflows/build-macos.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 5531531..3621e82 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -50,7 +50,7 @@ jobs:
           venv
           ~/.cache/pip
           ~/Library/Caches/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
         restore-keys: |
           ${{ runner.os }}-pip-
 
@@ -60,7 +60,7 @@ jobs:
         python -m venv venv
         source venv/bin/activate
         python -m pip install --upgrade pip
-        pip install --no-cache-dir -r requirements.txt
+        pip install --no-cache-dir .
         pip install --no-cache-dir cx_Freeze dmgbuild
 
     - name: Prepare build variables
@@ -80,6 +80,13 @@ jobs:
     - name: Create cx_Freeze setup script
       shell: bash
       run: |
+        # Create entry point script
+        cat > ytsage_entry.py <<'ENTRY'
+        from ytsage.main import main
+        if __name__ == "__main__":
+            main()
+        ENTRY
+
         cat > setup_cxfreeze.py <<'PY'
         import os
         from cx_Freeze import setup, Executable
@@ -89,14 +96,15 @@ jobs:
         build_exe_options = dict(
             optimize=2,
             packages=[
+                "ytsage",
                 "PySide6.QtCore",
                 "PySide6.QtGui",
                 "PySide6.QtWidgets",
+                "PySide6.QtMultimedia",
                 "requests",
                 "PIL",
                 "packaging",
                 "markdown",
-                "pyglet",
                 "loguru",
                 "setuptools",
             ],
@@ -110,7 +118,6 @@ jobs:
                 "PySide6.QtXml",
                 "PySide6.QtSql",
                 "PySide6.QtHelp",
-                "PySide6.QtMultimedia",
                 "PySide6.QtQml",
                 "PySide6.QtQuick",
                 "PySide6.QtWebEngineCore",
@@ -127,19 +134,18 @@ jobs:
                 "tests",
             ],
             include_files=[
-                ("src", "src"),
-                ("assets/branding/icons", "lib/assets/branding/icons"),
-                ("assets/Icon", "lib/assets/Icon"),
-                ("assets/sound", "lib/assets/sound"),
-                ("languages", "lib/languages"),
+                ("ytsage/assets/Icon", "lib/assets/Icon"),
+                ("ytsage/assets/sound", "lib/assets/sound"),
+                ("ytsage/languages", "lib/languages"),
+                ("branding/icons", "lib/assets/branding/icons"),
             ],
         )
 
         executables = [
             Executable(
-                script="main.py",
+                script="ytsage_entry.py",
                 target_name=f"YTSage-v{version}",
-                icon="assets/branding/icons/icon.icns",
+                icon="branding/icons/icon.icns",
             )
         ]
 
@@ -150,7 +156,7 @@ jobs:
             options={
                 "build_exe": build_exe_options,
                 "bdist_mac": {
-                    "iconfile": "assets/branding/icons/icon.icns",
+                    "iconfile": "branding/icons/icon.icns",
                     "bundle_name": f"YTSage-v{version}",
                 },
                 "bdist_dmg": {