mirror of
https://github.com/pacnpal/Pac-cogs.git
synced 2025-12-20 02:41:06 -05:00
The video downloading issues have been resolved by implementing comprehensive error handling and resource management:
FFmpeg is now properly managed: Binaries are downloaded and verified on startup Permissions are properly set Hardware acceleration is detected and used when available Resources are cleaned up properly Error handling has been improved: Specific exception types for different errors Better error messages and logging Appropriate reaction indicators Enhanced component error handling Resource management has been enhanced: Failed downloads are tracked and cleaned up Temporary files are handled properly Queue management is more robust Concurrent downloads are better managed Verification has been strengthened: FFmpeg binaries are verified Video files are validated Compression results are checked Component initialization is verified
This commit is contained in:
pacnpal
@@ -19,6 +19,7 @@ from .exceptions import DownloadError
|
||||
|
||||
logger = logging.getLogger("VideoArchiver")
|
||||
|
||||
|
||||
@contextmanager
|
||||
def temp_path_context():
|
||||
"""Context manager for temporary path creation and cleanup"""
|
||||
@@ -32,6 +33,7 @@ def temp_path_context():
|
||||
except Exception as e:
|
||||
logger.error(f"Error cleaning up temp directory {temp_dir}: {e}")
|
||||
|
||||
|
||||
class FFmpegDownloader:
|
||||
FFMPEG_URLS = {
|
||||
"Windows": {
|
||||
@@ -42,15 +44,15 @@ class FFmpegDownloader:
|
||||
},
|
||||
"Linux": {
|
||||
"x86_64": {
|
||||
"url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz",
|
||||
"url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz",
|
||||
"bin_names": ["ffmpeg", "ffprobe"],
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz",
|
||||
"url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linuxarm64-gpl.tar.xz",
|
||||
"bin_names": ["ffmpeg", "ffprobe"],
|
||||
},
|
||||
"armv7l": {
|
||||
"url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-armhf-static.tar.xz",
|
||||
"url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linuxarm32-gpl.tar.xz",
|
||||
"bin_names": ["ffmpeg", "ffprobe"],
|
||||
},
|
||||
},
|
||||
@@ -75,7 +77,7 @@ class FFmpegDownloader:
|
||||
self.base_dir = base_dir
|
||||
self.ffmpeg_path = self.base_dir / self._get_binary_names()[0]
|
||||
self.ffprobe_path = self.base_dir / self._get_binary_names()[1]
|
||||
|
||||
|
||||
logger.info(f"Initialized FFmpeg downloader for {system}/{machine}")
|
||||
logger.info(f"FFmpeg binary path: {self.ffmpeg_path}")
|
||||
logger.info(f"FFprobe binary path: {self.ffprobe_path}")
|
||||
@@ -85,14 +87,18 @@ class FFmpegDownloader:
|
||||
try:
|
||||
return self.FFMPEG_URLS[self.system][self.machine]["bin_names"]
|
||||
except KeyError:
|
||||
raise DownloadError(f"Unsupported system/architecture: {self.system}/{self.machine}")
|
||||
raise DownloadError(
|
||||
f"Unsupported system/architecture: {self.system}/{self.machine}"
|
||||
)
|
||||
|
||||
def _get_download_url(self) -> str:
|
||||
"""Get the appropriate download URL for the current system"""
|
||||
try:
|
||||
return self.FFMPEG_URLS[self.system][self.machine]["url"]
|
||||
except KeyError:
|
||||
raise DownloadError(f"Unsupported system/architecture: {self.system}/{self.machine}")
|
||||
raise DownloadError(
|
||||
f"Unsupported system/architecture: {self.system}/{self.machine}"
|
||||
)
|
||||
|
||||
def download(self) -> Dict[str, Path]:
|
||||
"""Download and set up FFmpeg and FFprobe binaries with retries"""
|
||||
@@ -103,7 +109,7 @@ class FFmpegDownloader:
|
||||
for attempt in range(max_retries):
|
||||
try:
|
||||
logger.info(f"Download attempt {attempt + 1}/{max_retries}")
|
||||
|
||||
|
||||
# Ensure base directory exists with proper permissions
|
||||
self.base_dir.mkdir(parents=True, exist_ok=True)
|
||||
os.chmod(str(self.base_dir), 0o777)
|
||||
@@ -119,28 +125,27 @@ class FFmpegDownloader:
|
||||
with temp_path_context() as temp_dir:
|
||||
# Download archive
|
||||
archive_path = self._download_archive(temp_dir)
|
||||
|
||||
|
||||
# Verify download
|
||||
if not self._verify_download(archive_path):
|
||||
raise DownloadError("Downloaded file verification failed")
|
||||
|
||||
|
||||
# Extract binaries
|
||||
self._extract_binaries(archive_path, temp_dir)
|
||||
|
||||
|
||||
# Set proper permissions
|
||||
for binary_path in [self.ffmpeg_path, self.ffprobe_path]:
|
||||
os.chmod(str(binary_path), 0o755)
|
||||
|
||||
|
||||
# Verify binaries
|
||||
if not self.verify():
|
||||
raise DownloadError("Binary verification failed")
|
||||
|
||||
|
||||
logger.info(f"Successfully downloaded FFmpeg to {self.ffmpeg_path}")
|
||||
logger.info(f"Successfully downloaded FFprobe to {self.ffprobe_path}")
|
||||
return {
|
||||
"ffmpeg": self.ffmpeg_path,
|
||||
"ffprobe": self.ffprobe_path
|
||||
}
|
||||
logger.info(
|
||||
f"Successfully downloaded FFprobe to {self.ffprobe_path}"
|
||||
)
|
||||
return {"ffmpeg": self.ffmpeg_path, "ffprobe": self.ffprobe_path}
|
||||
|
||||
except Exception as e:
|
||||
last_error = str(e)
|
||||
@@ -154,17 +159,20 @@ class FFmpegDownloader:
|
||||
def _download_archive(self, temp_dir: str) -> Path:
|
||||
"""Download FFmpeg archive with progress tracking"""
|
||||
url = self._get_download_url()
|
||||
archive_path = Path(temp_dir) / f"ffmpeg_archive{'.zip' if self.system == 'Windows' else '.tar.xz'}"
|
||||
|
||||
archive_path = (
|
||||
Path(temp_dir)
|
||||
/ f"ffmpeg_archive{'.zip' if self.system == 'Windows' else '.tar.xz'}"
|
||||
)
|
||||
|
||||
logger.info(f"Downloading FFmpeg from {url}")
|
||||
try:
|
||||
response = requests.get(url, stream=True, timeout=30)
|
||||
response.raise_for_status()
|
||||
|
||||
total_size = int(response.headers.get('content-length', 0))
|
||||
|
||||
total_size = int(response.headers.get("content-length", 0))
|
||||
block_size = 8192
|
||||
downloaded = 0
|
||||
|
||||
|
||||
with open(archive_path, "wb") as f:
|
||||
for chunk in response.iter_content(chunk_size=block_size):
|
||||
f.write(chunk)
|
||||
@@ -172,9 +180,9 @@ class FFmpegDownloader:
|
||||
if total_size > 0:
|
||||
percent = (downloaded / total_size) * 100
|
||||
logger.debug(f"Download progress: {percent:.1f}%")
|
||||
|
||||
|
||||
return archive_path
|
||||
|
||||
|
||||
except Exception as e:
|
||||
raise DownloadError(f"Failed to download FFmpeg: {str(e)}")
|
||||
|
||||
@@ -183,20 +191,20 @@ class FFmpegDownloader:
|
||||
try:
|
||||
if not archive_path.exists():
|
||||
return False
|
||||
|
||||
|
||||
# Check file size
|
||||
size = archive_path.stat().st_size
|
||||
if size < 1000000: # Less than 1MB is suspicious
|
||||
logger.error(f"Downloaded file too small: {size} bytes")
|
||||
return False
|
||||
|
||||
|
||||
# Check file hash
|
||||
with open(archive_path, 'rb') as f:
|
||||
with open(archive_path, "rb") as f:
|
||||
file_hash = hashlib.sha256(f.read()).hexdigest()
|
||||
logger.debug(f"Archive hash: {file_hash}")
|
||||
|
||||
|
||||
return True
|
||||
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Download verification failed: {str(e)}")
|
||||
return False
|
||||
@@ -205,38 +213,60 @@ class FFmpegDownloader:
|
||||
"""Extract FFmpeg and FFprobe binaries from archive"""
|
||||
logger.info("Extracting FFmpeg and FFprobe binaries")
|
||||
|
||||
if self.system == "Windows":
|
||||
self._extract_zip(archive_path, temp_dir)
|
||||
else:
|
||||
self._extract_tar(archive_path, temp_dir)
|
||||
try:
|
||||
if self.system == "Windows":
|
||||
self._extract_zip(archive_path, temp_dir)
|
||||
else:
|
||||
self._extract_tar(archive_path, temp_dir)
|
||||
|
||||
# Ensure binaries have correct permissions
|
||||
for binary_path in [self.ffmpeg_path, self.ffprobe_path]:
|
||||
if binary_path.exists():
|
||||
os.chmod(str(binary_path), 0o755)
|
||||
logger.info(f"Set permissions for {binary_path}")
|
||||
else:
|
||||
raise DownloadError(
|
||||
f"Binary not found after extraction: {binary_path}"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
raise DownloadError(f"Failed to extract binaries: {e}")
|
||||
|
||||
def _extract_zip(self, archive_path: Path, temp_dir: str):
|
||||
"""Extract from zip archive (Windows)"""
|
||||
with zipfile.ZipFile(archive_path, "r") as zip_ref:
|
||||
binary_names = self._get_binary_names()
|
||||
for binary_name in binary_names:
|
||||
binary_files = [f for f in zip_ref.namelist() if binary_name in f]
|
||||
binary_files = [
|
||||
f
|
||||
for f in zip_ref.namelist()
|
||||
if f.endswith(f"/{binary_name}") or f.endswith(f"\\{binary_name}")
|
||||
]
|
||||
if not binary_files:
|
||||
raise DownloadError(f"{binary_name} not found in archive")
|
||||
|
||||
|
||||
zip_ref.extract(binary_files[0], temp_dir)
|
||||
extracted_path = Path(temp_dir) / binary_files[0]
|
||||
target_path = self.base_dir / binary_name
|
||||
shutil.copy2(extracted_path, target_path)
|
||||
logger.info(f"Extracted {binary_name} to {target_path}")
|
||||
|
||||
def _extract_tar(self, archive_path: Path, temp_dir: str):
|
||||
"""Extract from tar archive (Linux/macOS)"""
|
||||
with tarfile.open(archive_path, "r:xz") as tar_ref:
|
||||
binary_names = self._get_binary_names()
|
||||
for binary_name in binary_names:
|
||||
binary_files = [f for f in tar_ref.getnames() if f.endswith(f"/{binary_name}")]
|
||||
binary_files = [
|
||||
f for f in tar_ref.getnames() if f.endswith(f"/{binary_name}")
|
||||
]
|
||||
if not binary_files:
|
||||
raise DownloadError(f"{binary_name} not found in archive")
|
||||
|
||||
|
||||
tar_ref.extract(binary_files[0], temp_dir)
|
||||
extracted_path = Path(temp_dir) / binary_files[0]
|
||||
target_path = self.base_dir / binary_name
|
||||
shutil.copy2(extracted_path, target_path)
|
||||
logger.info(f"Extracted {binary_name} to {target_path}")
|
||||
|
||||
def verify(self) -> bool:
|
||||
"""Verify FFmpeg and FFprobe binaries work"""
|
||||
@@ -253,28 +283,32 @@ class FFmpegDownloader:
|
||||
[str(self.ffmpeg_path), "-version"],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
timeout=5
|
||||
timeout=5,
|
||||
)
|
||||
|
||||
|
||||
# Test FFprobe functionality
|
||||
ffprobe_result = subprocess.run(
|
||||
[str(self.ffprobe_path), "-version"],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
timeout=5
|
||||
timeout=5,
|
||||
)
|
||||
|
||||
|
||||
if ffmpeg_result.returncode == 0 and ffprobe_result.returncode == 0:
|
||||
ffmpeg_version = ffmpeg_result.stdout.decode().split('\n')[0]
|
||||
ffprobe_version = ffprobe_result.stdout.decode().split('\n')[0]
|
||||
ffmpeg_version = ffmpeg_result.stdout.decode().split("\n")[0]
|
||||
ffprobe_version = ffprobe_result.stdout.decode().split("\n")[0]
|
||||
logger.info(f"FFmpeg verification successful: {ffmpeg_version}")
|
||||
logger.info(f"FFprobe verification successful: {ffprobe_version}")
|
||||
return True
|
||||
else:
|
||||
if ffmpeg_result.returncode != 0:
|
||||
logger.error(f"FFmpeg verification failed: {ffmpeg_result.stderr.decode()}")
|
||||
logger.error(
|
||||
f"FFmpeg verification failed: {ffmpeg_result.stderr.decode()}"
|
||||
)
|
||||
if ffprobe_result.returncode != 0:
|
||||
logger.error(f"FFprobe verification failed: {ffprobe_result.stderr.decode()}")
|
||||
logger.error(
|
||||
f"FFprobe verification failed: {ffprobe_result.stderr.decode()}"
|
||||
)
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user