Attempt to build windows binary with ffmpeg bundled

.github/workflows/publish.yml

@@ -29,13 +29,18 @@ jobs:
       with:
         python-version: '3.9'
 
+    - name: wget
+      uses: wei/wget@v1
+      with:
+        args: -O platform/ffmpeg.exe https://github.com/karaokenerds/karaoke-prep/releases/download/v0.8.3/ffmpeg.exe
+
     - name: Install dependencies with Poetry
       run: |
         pip install poetry
         poetry install
 
     - name: Build EXE with PyInstaller
-      run: poetry run pyinstaller --onefile karaoke-prep.spec
+      run: poetry run pyinstaller karaoke-prep.spec
 
     - name: Upload EXE as Artifact
       uses: actions/upload-artifact@v2

karaoke-prep.spec

@@ -4,7 +4,7 @@
 a = Analysis(
     ['karaoke_prep/utils/prep_cli.py'],
     pathex=[],
-    binaries=[],
+    binaries=[('platform/ffmpeg.exe', '.')],
     datas=[],
     hiddenimports=[],
     hookspath=[],
@@ -18,26 +18,20 @@ pyz = PYZ(a.pure)
 exe = EXE(
     pyz,
     a.scripts,
+    a.binaries,
+    a.datas,
     [],
-    exclude_binaries=True,
     name='karaoke-prep',
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
     upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
     console=True,
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
 )
-coll = COLLECT(
-    exe,
-    a.binaries,
-    a.datas,
-    strip=False,
-    upx=True,
-    upx_exclude=[],
-    name='karaoke-prep',
-)

karaoke_prep/karaoke_finalise/karaoke_finalise.py

@@ -1,5 +1,5 @@
 import os
-import subprocess
+import sys
 import tempfile
 import logging
 
@@ -26,7 +26,10 @@ def __init__(
 
         self.logger.debug(f"KaraokeFinalise instantiating")
 
-        self.ffmpeg_base_command = "ffmpeg -hide_banner -nostats"
+        # Path to the Windows PyInstaller frozen bundled ffmpeg.exe, or the system-installed FFmpeg binary on Mac/Linux
+        ffmpeg_path = os.path.join(sys._MEIPASS, "ffmpeg.exe") if getattr(sys, "frozen", False) else "ffmpeg"
+
+        self.ffmpeg_base_command = f"{ffmpeg_path} -hide_banner -nostats"
 
         if self.log_level == logging.DEBUG:
             self.ffmpeg_base_command += " -loglevel verbose"

karaoke_prep/karaoke_prep.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import re
 import glob
 import yt_dlp
@@ -62,7 +63,10 @@ def __init__(
         self.denoise_enabled = denoise_enabled
         self.create_track_subfolders = create_track_subfolders
 
-        self.ffmpeg_base_command = "ffmpeg -hide_banner -nostats"
+        # Path to the Windows PyInstaller frozen bundled ffmpeg.exe, or the system-installed FFmpeg binary on Mac/Linux
+        ffmpeg_path = os.path.join(sys._MEIPASS, "ffmpeg.exe") if getattr(sys, "frozen", False) else "ffmpeg"
+
+        self.ffmpeg_base_command = f"{ffmpeg_path} -hide_banner -nostats"
 
         if self.log_level == logging.DEBUG:
             self.ffmpeg_base_command += " -loglevel verbose"
@@ -401,11 +405,9 @@ def create_title_video(self, artist, title, format, output_image_filepath, outpu
         draw = ImageDraw.Draw(background)
 
         # Accessing the font file from the package resources
-        with pkg_resources.path('karaoke_prep.resources', format['intro_font']) as font_path:
+        with pkg_resources.path("karaoke_prep.resources", format["intro_font"]) as font_path:
             # Calculate positions and sizes for title and artist
-            title_font, _ = self.calculate_text_size_and_position(
-                draw, title, str(font_path), initial_font_size, resolution, title_padding
-            )
+            title_font, _ = self.calculate_text_size_and_position(draw, title, str(font_path), initial_font_size, resolution, title_padding)
             artist_font, _ = self.calculate_text_size_and_position(
                 draw, artist, str(font_path), initial_font_size, resolution, artist_padding
             )