Refactor FFmpeg integration and update CI workflows for resource management

- Moved FFmpeg checking logic to a separate module for better organization.
- Updated Linux and macOS CI workflows to manage FFmpeg resources more effectively.
- Removed obsolete CLI test workflow.
- Enhanced downloader to specify FFmpeg location dynamically.
- Added logging for FFmpeg path in the main window.

Author: Efeckc17

.github/workflows/linux-build.yml

@@ -29,8 +29,9 @@ jobs:
         run: |
           wget https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz
           tar xf ffmpeg-master-latest-linux64-gpl.tar.xz
-          mv ffmpeg-master-latest-linux64-gpl/bin/ffmpeg ffmpeg
-          chmod +x ffmpeg
+          mkdir -p resources
+          mv ffmpeg-master-latest-linux64-gpl/bin/ffmpeg resources/
+          chmod +x resources/ffmpeg
 
       - name: Download appimagetool
         run: |
@@ -42,22 +43,25 @@ jobs:
           pyinstaller --noconfirm --onefile --windowed --name YoutubeGo \
             --add-data "assets:assets" \
             --add-data "ui/themes:ui/themes" \
-            --add-data "ffmpeg:." \
+            --add-data "resources:resources" \
             main.py
 
           rm -rf AppDir
           mkdir -p AppDir/usr/bin
+          mkdir -p AppDir/usr/share/youtubego
           cp dist/YoutubeGo AppDir/usr/bin/
+          cp -r resources AppDir/usr/share/youtubego/
           cp assets/app.png AppDir/
           echo -e "[Desktop Entry]\nName=YoutubeGo\nExec=YoutubeGo\nIcon=app\nType=Application\nCategories=AudioVideo;Video;Utility;" > AppDir/YoutubeGo.desktop
           ln -sf usr/bin/YoutubeGo AppDir/AppRun
           chmod +x AppDir/AppRun
 
           ./appimagetool-x86_64.AppImage --appimage-extract-and-run AppDir
+          mv YoutubeGo-*-x86_64.AppImage YoutubeGo-x86_64.AppImage
 
       - name: Upload to GitHub Releases
         uses: softprops/action-gh-release@v1
         with:
-          files: '*.AppImage'
+          files: YoutubeGo-x86_64.AppImage
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}

.github/workflows/macos-build.yml

@@ -1,4 +1,4 @@
-name: Build and Release for macOS
+name: Build and Release macOS App
 
 on:
   push:
@@ -27,23 +27,56 @@ jobs:
         run: |
           curl -L https://evermeet.cx/ffmpeg/ffmpeg-6.1.zip -o ffmpeg.zip
           unzip ffmpeg.zip
-          chmod +x ffmpeg
+          mkdir -p resources
+          mv ffmpeg resources/
+          chmod +x resources/ffmpeg
 
-      - name: Build macOS App and ZIP
+      - name: Build macOS App
         run: |
-          pyinstaller --noconfirm --windowed --name YoutubeGo \
+          pyinstaller --noconfirm --onefile --windowed --name YoutubeGo \
             --add-data "assets:assets" \
             --add-data "ui/themes:ui/themes" \
-            --add-data "ffmpeg:." \
+            --add-data "resources:resources" \
             main.py
-          mkdir -p output
-          cp -r dist/YoutubeGo.app output/
-          cd output
-          zip -r YoutubeGo-macOS.zip YoutubeGo.app
+
+          mkdir -p "YoutubeGo.app/Contents/MacOS"
+          mkdir -p "YoutubeGo.app/Contents/Resources"
+          cp dist/YoutubeGo "YoutubeGo.app/Contents/MacOS/"
+          cp -r resources "YoutubeGo.app/Contents/Resources/"
+          cp assets/app.png "YoutubeGo.app/Contents/Resources/"
+          
+          # Create Info.plist
+          cat > "YoutubeGo.app/Contents/Info.plist" << EOL
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+              <key>CFBundleExecutable</key>
+              <string>YoutubeGo</string>
+              <key>CFBundleIconFile</key>
+              <string>app</string>
+              <key>CFBundleIdentifier</key>
+              <string>com.youtubego.app</string>
+              <key>CFBundleName</key>
+              <string>YoutubeGo</string>
+              <key>CFBundlePackageType</key>
+              <string>APPL</string>
+              <key>CFBundleShortVersionString</key>
+              <string>4.4</string>
+              <key>LSMinimumSystemVersion</key>
+              <string>10.13</string>
+              <key>NSHighResolutionCapable</key>
+              <true/>
+          </dict>
+          </plist>
+          EOL
+
+          # Create DMG
+          hdiutil create -volname "YoutubeGo" -srcfolder "YoutubeGo.app" -ov -format UDZO "YoutubeGo.dmg"
 
       - name: Upload to GitHub Releases
         uses: softprops/action-gh-release@v1
         with:
-          files: output/YoutubeGo-macOS.zip
+          files: '*.dmg'
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}

.github/workflows/youtubego-cli-tests.yml

@@ -159,8 +159,10 @@ def run(self):
                         "merge_output_format": self.task.output_format.lower(),
                         "postprocessors": [{
                             "key": "FFmpegVideoRemuxer",
-                            "preferedformat": self.task.output_format.lower()
-                        }]
+                            "preferedformat": self.task.output_format.lower(),
+                            "when": "post_process"
+                        }],
+                        "ffmpeg_location": self.task.ffmpeg_path if hasattr(self.task, 'ffmpeg_path') else None
                     })
                 except Exception as e:
                     self.log_signal.emit(f"Format configuration failed, falling back to basic format: {str(e)}")

core/downloader.py

@@ -0,0 +1,69 @@
+import os
+import platform
+import subprocess
+
+def check_ffmpeg():
+    try:
+        app_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        candidates = []
+        
+        if platform.system() == "Windows":
+            candidates += [
+                os.path.join(app_dir, "ffmpeg.exe"),
+                os.path.join(app_dir, "bin", "ffmpeg.exe"),
+                os.path.join(app_dir, "resources", "ffmpeg.exe"),
+            ]
+        else:
+            candidates += [
+                os.path.join(app_dir, "ffmpeg"),
+                os.path.join(app_dir, "bin", "ffmpeg"),
+                os.path.join(app_dir, "resources", "ffmpeg"),
+                os.path.join(app_dir, "usr", "share", "youtubego", "resources", "ffmpeg"),
+                os.path.join(os.path.dirname(app_dir), "Resources", "ffmpeg"),
+            ]
+
+        for path in candidates:
+            if os.path.exists(path) and os.access(path, os.X_OK):
+                return True, path
+
+        if platform.system() == "Windows":
+            result = subprocess.run(["where", "ffmpeg"], capture_output=True, text=True)
+        else:
+            result = subprocess.run(["which", "ffmpeg"], capture_output=True, text=True)
+
+        if result.returncode == 0:
+            ffmpeg_path = result.stdout.strip().splitlines()[0]
+            if os.path.exists(ffmpeg_path) and os.access(ffmpeg_path, os.X_OK):
+                test_cmd = f'"{ffmpeg_path}" -version'
+                test_result = subprocess.run(test_cmd, shell=True, capture_output=True)
+                if test_result.returncode == 0:
+                    return True, ffmpeg_path
+
+        common_paths = []
+        if platform.system() == "Windows":
+            common_paths = [
+                os.path.join(os.environ.get("ProgramFiles", "C:\\Program Files"), "ffmpeg", "bin", "ffmpeg.exe"),
+                os.path.join(os.environ.get("ProgramFiles(x86)", "C:\\Program Files (x86)"), "ffmpeg", "bin", "ffmpeg.exe")
+            ]
+        elif platform.system() == "Darwin":
+            common_paths = [
+                "/usr/local/bin/ffmpeg",
+                "/opt/homebrew/bin/ffmpeg",
+                os.path.expanduser("~/homebrew/bin/ffmpeg")
+            ]
+        else:
+            common_paths = [
+                "/usr/bin/ffmpeg",
+                "/usr/local/bin/ffmpeg",
+                "/snap/bin/ffmpeg"
+            ]
+
+        for path in common_paths:
+            if os.path.exists(path) and os.access(path, os.X_OK):
+                return True, path
+
+        return False, ""
+
+    except Exception as e:
+        print(f"Error checking FFmpeg: {str(e)}")
+        return False, "" 

core/ffmpeg_checker.py

@@ -1,69 +1,9 @@
 import sys
 import os
-import platform
-import subprocess
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtCore import QSharedMemory, QSystemSemaphore, Qt
 from ui.main_window import MainWindow
-
-def check_ffmpeg():
-    
-    try:
-        app_dir = os.path.dirname(os.path.abspath(__file__))
-        candidates = []
-        if platform.system() == "Windows":
-            candidates += [
-                os.path.join(app_dir, "ffmpeg.exe"),
-                os.path.join(app_dir, "bin", "ffmpeg.exe"),
-                os.path.join(app_dir, "resources", "ffmpeg.exe"),
-            ]
-        else:
-            candidates += [
-                os.path.join(app_dir, "ffmpeg"),
-                os.path.join(app_dir, "bin", "ffmpeg"),
-                os.path.join(app_dir, "resources", "ffmpeg"),
-            ]
-        for path in candidates:
-            if os.path.exists(path) and os.access(path, os.X_OK):
-                return True, path
-        
-        if platform.system() == "Windows":
-            result = subprocess.run(["where", "ffmpeg"], capture_output=True, text=True)
-        else:
-            result = subprocess.run(["which", "ffmpeg"], capture_output=True, text=True)
-        if result.returncode == 0:
-            ffmpeg_path = result.stdout.strip().splitlines()[0]
-            if os.path.exists(ffmpeg_path) and os.access(ffmpeg_path, os.X_OK):
-                test_cmd = f'"{ffmpeg_path}" -version'
-                test_result = subprocess.run(test_cmd, shell=True, capture_output=True)
-                if test_result.returncode == 0:
-                    return True, ffmpeg_path
-        
-        common_paths = []
-        if platform.system() == "Windows":
-            common_paths = [
-                os.path.join(os.environ.get("ProgramFiles", "C:\\Program Files"), "ffmpeg", "bin", "ffmpeg.exe"),
-                os.path.join(os.environ.get("ProgramFiles(x86)", "C:\\Program Files (x86)"), "ffmpeg", "bin", "ffmpeg.exe")
-            ]
-        elif platform.system() == "Darwin":
-            common_paths = [
-                "/usr/local/bin/ffmpeg",
-                "/opt/homebrew/bin/ffmpeg",
-                os.path.expanduser("~/homebrew/bin/ffmpeg")
-            ]
-        else:
-            common_paths = [
-                "/usr/bin/ffmpeg",
-                "/usr/local/bin/ffmpeg",
-                "/snap/bin/ffmpeg"
-            ]
-        for path in common_paths:
-            if os.path.exists(path) and os.access(path, os.X_OK):
-                return True, path
-        return False, ""
-    except Exception as e:
-        print(f"Error checking FFmpeg: {str(e)}")
-        return False, ""
+from core.ffmpeg_checker import check_ffmpeg
 
 def main():
     shared_mem = QSharedMemory("YoutubeGO4.4")

main.py

@@ -36,6 +36,8 @@ def __init__(self, ffmpeg_found=None, ffmpeg_path=None):
         self.setGeometry(100, 100, 1280, 800)
         self.ffmpeg_found = ffmpeg_found if ffmpeg_found is not None else False
         self.ffmpeg_path = ffmpeg_path if ffmpeg_path is not None else ""
+        if self.ffmpeg_found and self.ffmpeg_path:
+            print(f"FFmpeg path set to: {self.ffmpeg_path}")
         self.ffmpeg_label = QLabel()
         self.log_dock_visible = True
         self.show_logs_btn = AnimatedButton("Logs")