Added debug for ffmpeg extraction.

Infinitode · Infinitode · commit 840f6eca4364 · 2025-03-10T13:43:07.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,14 +30,14 @@ jobs:
         if: matrix.os == 'macos-latest'
         run: |
           pip install pillow
-          pyinstaller --onefile --name Scriptify --icon web/favicon.ico --add-data "ffmpeg/ffmpeg_mac.zip:ffmpeg/ffmpeg_mac.zip" \
+          pyinstaller --onefile --name Scriptify --icon web/favicon.ico --add-data "ffmpeg/ffmpeg_mac.zip:ffmpeg" \
             --add-data "web:web" --add-data "js:js" --add-data "index.html:." --add-data "launch.html:." --add-data "style.css:." \
             --osx-bundle-identifier com.infinitode.scriptify --windowed main.py --version-file version_info.txt
 
       - name: Build for Linux
         if: matrix.os == 'ubuntu-latest'
         run: |
-          pyinstaller --onefile --name Scriptify --icon web/favicon.ico --add-data "ffmpeg/ffmpeg_ubuntu.zip:ffmpeg/ffmpeg_ubuntu.zip" \
+          pyinstaller --onefile --name Scriptify --icon web/favicon.ico --add-data "ffmpeg/ffmpeg_ubuntu.zip:ffmpeg" \
             --add-data "web:web" --add-data "js:js" --add-data "index.html:." --add-data "launch.html:." --add-data "style.css:." \
             --windowed main.py --version-file version_info.txt
 
@@ -49,7 +49,7 @@ jobs:
       - name: Build for Windows
         if: matrix.os == 'windows-latest'
         run: |
-          pyinstaller --onefile --name Scriptify --icon web/favicon.ico --add-data "ffmpeg/ffmpeg_windows.zip:ffmpeg/ffmpeg_windows.zip" `
+          pyinstaller --onefile --name Scriptify --icon web/favicon.ico --add-data "ffmpeg/ffmpeg_windows.zip:ffmpeg" `
             --add-data "web:web" --add-data "js:js" --add-data "index.html:." --add-data "launch.html:." --add-data "style.css:." `
             main.py --version-file version_info.txt
 
diff --git a/main.py b/main.py
@@ -57,13 +57,26 @@ def extract_ffmpeg():
 
     # Paths
     archive_path = os.path.join(base_path, "ffmpeg", archive_name)
-    extracted_path = os.path.join(temp_dir, extracted_binary)
 
-    # Extract using shutil (built-in support for ZIP)
+    # Extract using shutil
     try:
-        print(f"Extracting {archive_name}...")
+        print(f"Extracting {archive_name} to {temp_dir}...")
         shutil.unpack_archive(archive_path, temp_dir)
 
+        # Debug: List extracted files
+        extracted_files = os.listdir(temp_dir)
+        print("Extracted files:", extracted_files)
+
+        # Find FFmpeg binary (handles nested folders)
+        extracted_path = None
+        for root, _, files in os.walk(temp_dir):
+            if extracted_binary in files:
+                extracted_path = os.path.join(root, extracted_binary)
+                break
+
+        if extracted_path is None:
+            raise FileNotFoundError(f"FFmpeg binary '{extracted_binary}' not found in extracted files.")
+
         # Ensure correct executable permissions (Linux/macOS)
         if not sys.platform.startswith("win"):
             os.chmod(extracted_path, 0o755)
