From e5ea9f7bed2f5120ae48607fd346761db46008ff Mon Sep 17 00:00:00 2001 From: pacnpal <183241239+pacnpal@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:33:18 +0000 Subject: [PATCH] fix: Update imports for Red-DiscordBot compatibility - Modified imports to use full package paths - Fixed circular import issues - Updated imports to work within cog structure --- videoarchiver/ffmpeg/__init__.py | 7 +++---- videoarchiver/ffmpeg_manager.py | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/videoarchiver/ffmpeg/__init__.py b/videoarchiver/ffmpeg/__init__.py index dbedc15..e7bd9a1 100644 --- a/videoarchiver/ffmpeg/__init__.py +++ b/videoarchiver/ffmpeg/__init__.py @@ -1,7 +1,6 @@ """FFmpeg management package""" -from .exceptions import FFmpegError, GPUError, DownloadError +from videoarchiver.ffmpeg.exceptions import FFmpegError, GPUError, DownloadError +from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager -# Import the manager class directly in the modules that need it -# to avoid circular imports -__all__ = ['FFmpegError', 'GPUError', 'DownloadError'] +__all__ = ['FFmpegManager', 'FFmpegError', 'GPUError', 'DownloadError'] diff --git a/videoarchiver/ffmpeg_manager.py b/videoarchiver/ffmpeg_manager.py index 6b6027d..742b3b9 100644 --- a/videoarchiver/ffmpeg_manager.py +++ b/videoarchiver/ffmpeg_manager.py @@ -1,6 +1,7 @@ """FFmpeg management module""" -from .ffmpeg.ffmpeg_manager import FFmpegManager -from .ffmpeg.exceptions import FFmpegError, GPUError, DownloadError +# Import directly from the local ffmpeg package +from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager +from videoarchiver.ffmpeg.exceptions import FFmpegError, GPUError, DownloadError __all__ = ['FFmpegManager', 'FFmpegError', 'GPUError', 'DownloadError']