From e287b0b6b5b8cb5246177ea2fd3eb2c3c0905bd1 Mon Sep 17 00:00:00 2001
From: Your Name <mohamed.mohamed112@ai.mnu.edu.eg>
Date: Tue, 9 Sep 2025 13:37:21 +0300
Subject: [PATCH] Update asset paths in build workflows

Changed asset inclusion and screenshot removal paths from 'assets' to 'lib/assets' in Linux, macOS, and Windows build workflows to reflect new directory structure and ensure screenshots are excluded from packaged builds.
---
 .github/workflows/build-linux.yml   |  6 +++---
 .github/workflows/build-macos.yml   | 10 +++++-----
 .github/workflows/build-windows.yml | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index fdc4d8a..f7416a4 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -122,7 +122,7 @@ jobs:
             ],
             include_files=[
                 ("src", "src"),
-                ("assets", "assets"),
+                ("assets", "lib/assets"),
                 ("ytsage.desktop", "share/applications/ytsage.desktop"),
                 ("assets/branding/icons/icon.png", "share/pixmaps/ytsage.png"),
             ],
@@ -185,8 +185,8 @@ jobs:
 
         # Remove screenshots to reduce size before packaging
         build_dir=$(ls -d build/exe.* 2>/dev/null | head -n1 || true)
-        if [ -n "$build_dir" ] && [ -d "$build_dir/assets/branding/screenshots" ]; then
-          rm -rf "$build_dir/assets/branding/screenshots"
+        if [ -n "$build_dir" ] && [ -d "$build_dir/lib/assets/branding/screenshots" ]; then
+          rm -rf "$build_dir/lib/assets/branding/screenshots"
           echo "Removed screenshots folder from $build_dir"
         fi
 
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index abb9881..52a95c4 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -123,7 +123,7 @@ jobs:
             ],
             include_files=[
                 ("src", "src"),
-                ("assets", "assets"),
+                ("assets", "lib/assets"),
             ],
         )
 
@@ -171,8 +171,8 @@ jobs:
         if [ -z "$app_path" ]; then
           app_path=$(ls -d dist/*.app build/dist/*.app build/*.app 2>/dev/null | head -n1 || true)
         fi
-        if [ -n "$app_path" ] && [ -d "$app_path/Contents/Resources/assets/branding/screenshots" ]; then
-          rm -rf "$app_path/Contents/Resources/assets/branding/screenshots"
+        if [ -n "$app_path" ] && [ -d "$app_path/Contents/Resources/lib/assets/branding/screenshots" ]; then
+          rm -rf "$app_path/Contents/Resources/lib/assets/branding/screenshots"
           echo "Removed screenshots folder from .app bundle at $app_path"
         fi
         echo "Post-bdist_mac directory listing:"
@@ -207,8 +207,8 @@ jobs:
           app_base="$(basename "$app_path")"
           app_parent="$(dirname "$app_path")"
           # Ensure screenshots folder is not shipped
-          if [ -d "$app_path/Contents/Resources/assets/branding/screenshots" ]; then
-            rm -rf "$app_path/Contents/Resources/assets/branding/screenshots"
+          if [ -d "$app_path/Contents/Resources/lib/assets/branding/screenshots" ]; then
+            rm -rf "$app_path/Contents/Resources/lib/assets/branding/screenshots"
             echo "Removed screenshots folder from .app bundle at $app_path"
           fi
           (cd "$app_parent" && zip -r "${GITHUB_WORKSPACE}/artifacts/YTSage-v${version}-${ARCH_SUFFIX}.app.zip" "$app_base")
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 64df03a..851d0cc 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -84,11 +84,11 @@ jobs:
           --packages "PySide6.QtCore,PySide6.QtGui,PySide6.QtWidgets,requests,PIL,packaging,markdown,pyglet,loguru,setuptools" `
           --excludes "PySide6.QtBluetooth,PySide6.QtNetwork,PySide6.QtOpenGL,PySide6.QtPrintSupport,PySide6.QtSvg,PySide6.QtTest,PySide6.QtXml,PySide6.QtSql,PySide6.QtHelp,PySide6.QtMultimedia,PySide6.QtQml,PySide6.QtQuick,PySide6.QtWebEngineCore,PIL.ImageDraw,PIL.ImageFont,numpy,scipy,wx,pandas,tkinter,yt_dlp,unittest,test,tests" `
           --include-files "src" `
-          --include-files "assets"
+          --include-files "assets,lib/assets"
         
         # Remove screenshots folder to reduce build size
-        if (Test-Path "dist\YTSage\assets\branding\screenshots") {
-          Remove-Item "dist\YTSage\assets\branding\screenshots" -Recurse -Force
+        if (Test-Path "dist\YTSage\lib\assets\branding\screenshots") {
+          Remove-Item "dist\YTSage\lib\assets\branding\screenshots" -Recurse -Force
           Write-Host "Removed screenshots folder from standard build"
         }
     
@@ -163,11 +163,11 @@ jobs:
           --packages "PySide6.QtCore,PySide6.QtGui,PySide6.QtWidgets,requests,PIL,packaging,markdown,pyglet,loguru,setuptools" `
           --excludes "PySide6.QtBluetooth,PySide6.QtNetwork,PySide6.QtOpenGL,PySide6.QtPrintSupport,PySide6.QtSvg,PySide6.QtTest,PySide6.QtXml,PySide6.QtSql,PySide6.QtHelp,PySide6.QtMultimedia,PySide6.QtQml,PySide6.QtQuick,PySide6.QtWebEngineCore,PIL.ImageDraw,PIL.ImageFont,numpy,scipy,wx,pandas,tkinter,yt_dlp,unittest,test,tests" `
           --include-files "src" `
-          --include-files "assets"
+          --include-files "assets,lib/assets"
 
         # Remove screenshots folder to reduce build size
-        if (Test-Path "dist\YTSage-FFmpeg\assets\branding\screenshots") {
-          Remove-Item "dist\YTSage-FFmpeg\assets\branding\screenshots" -Recurse -Force
+        if (Test-Path "dist\YTSage-FFmpeg\lib\assets\branding\screenshots") {
+          Remove-Item "dist\YTSage-FFmpeg\lib\assets\branding\screenshots" -Recurse -Force
           Write-Host "Removed screenshots folder from FFmpeg build"
         }