From 6d25ea8e1118db91d93af9fb46971dc20fff7c32 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Thu, 14 Nov 2024 21:44:41 +0000
Subject: [PATCH] Fix ffmpeg

---
 .../__pycache__/__init__.cpython-312.pyc         | Bin 0 -> 5995 bytes
 videoarchiver/ffmpeg_manager.py                  |  11 +++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 videoarchiver/__pycache__/__init__.cpython-312.pyc

diff --git a/videoarchiver/__pycache__/__init__.cpython-312.pyc b/videoarchiver/__pycache__/__init__.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a803235b10da87a7b61a2f9f0c3057cc86fcec77
GIT binary patch
literal 5995
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
F{{?3n=?DM-

literal 0
HcmV?d00001

diff --git a/videoarchiver/ffmpeg_manager.py b/videoarchiver/ffmpeg_manager.py
index cc5ccdc..2b031f4 100644
--- a/videoarchiver/ffmpeg_manager.py
+++ b/videoarchiver/ffmpeg_manager.py
@@ -700,6 +700,13 @@ class FFmpegManager:
                             raise DownloadError(f"Failed to download FFmpeg: {str(e)}")
                         time.sleep(self.RETRY_DELAY)
 
+                # Remove existing ffmpeg if it exists (handle both file and directory)
+                if self.ffmpeg_path.exists():
+                    if self.ffmpeg_path.is_dir():
+                        shutil.rmtree(self.ffmpeg_path)
+                    else:
+                        self.ffmpeg_path.unlink()
+
                 # Extract archive
                 if self.system == "Windows":
                     with zipfile.ZipFile(archive_path, "r") as zip_ref:
@@ -709,8 +716,6 @@ class FFmpegManager:
                         if not ffmpeg_files:
                             raise DownloadError("FFmpeg binary not found in archive")
                         zip_ref.extract(ffmpeg_files[0], self.base_path)
-                        if self.ffmpeg_path.exists():
-                            self.ffmpeg_path.unlink()
                         os.rename(self.base_path / ffmpeg_files[0], self.ffmpeg_path)
                 else:
                     with tarfile.open(archive_path, "r:xz") as tar_ref:
@@ -720,8 +725,6 @@ class FFmpegManager:
                         if not ffmpeg_files:
                             raise DownloadError("FFmpeg binary not found in archive")
                         tar_ref.extract(ffmpeg_files[0], self.base_path)
-                        if self.ffmpeg_path.exists():
-                            self.ffmpeg_path.unlink()
                         os.rename(self.base_path / ffmpeg_files[0], self.ffmpeg_path)
 
                 # Set executable permissions on Unix systems