From d03e8dc8e8cb55e2aedcad485479deaa78a2a438 Mon Sep 17 00:00:00 2001 From: pacnpal <183241239+pacnpal@users.noreply.github.com> Date: Mon, 18 Nov 2024 01:01:12 +0000 Subject: [PATCH] ch ch ch changes --- videoarchiver/__init__.py | 8 +++--- videoarchiver/config/__init__.py | 10 +++---- videoarchiver/config/channel_manager.py | 2 +- videoarchiver/config/role_manager.py | 2 +- videoarchiver/config/settings_formatter.py | 2 +- videoarchiver/config/validation_manager.py | 2 +- videoarchiver/config_manager.py | 10 +++---- videoarchiver/core/__init__.py | 2 +- videoarchiver/core/base.py | 30 ++++++++++---------- videoarchiver/core/cleanup.py | 6 ++-- videoarchiver/core/commands.py | 2 +- videoarchiver/core/component_manager.py | 12 ++++---- videoarchiver/core/error_handler.py | 4 +-- videoarchiver/core/events.py | 14 ++++----- videoarchiver/core/guild.py | 10 +++---- videoarchiver/core/initialization.py | 6 ++-- videoarchiver/core/lifecycle.py | 4 +-- videoarchiver/core/response_handler.py | 2 +- videoarchiver/core/settings.py | 2 +- videoarchiver/database/__init__.py | 8 +++--- videoarchiver/database/connection_manager.py | 2 +- videoarchiver/database/schema_manager.py | 2 +- videoarchiver/database/video_archive_db.py | 6 ++-- videoarchiver/ffmpeg/__init__.py | 12 ++++---- videoarchiver/ffmpeg/binary_manager.py | 6 ++-- videoarchiver/ffmpeg/encoder_params.py | 2 +- videoarchiver/ffmpeg/ffmpeg_downloader.py | 2 +- videoarchiver/ffmpeg/ffmpeg_manager.py | 14 ++++----- videoarchiver/ffmpeg/verification_manager.py | 2 +- videoarchiver/processor/cleanup_manager.py | 4 +-- videoarchiver/processor/core.py | 8 +++--- videoarchiver/processor/message_handler.py | 14 ++++----- videoarchiver/processor/message_validator.py | 2 +- videoarchiver/processor/queue_handler.py | 16 +++++------ videoarchiver/processor/queue_processor.py | 4 +-- videoarchiver/processor/reactions.py | 4 +-- videoarchiver/processor/status_display.py | 2 +- videoarchiver/update_checker.py | 2 +- 38 files changed, 121 insertions(+), 121 deletions(-) diff --git a/videoarchiver/__init__.py b/videoarchiver/__init__.py index f6fafba..25aaa4f 100644 --- a/videoarchiver/__init__.py +++ b/videoarchiver/__init__.py @@ -98,10 +98,10 @@ except ImportError: from videoarchiver import database from videoarchiver import config from videoarchiver import core - from videoarchiver.core.base import VideoArchiver - from videoarchiver.core.initialization import initialize_cog, init_callback - from videoarchiver.core.cleanup import cleanup_resources - from videoarchiver.utils.exceptions import ( + # from videoarchiver.core.base import VideoArchiver + # from videoarchiver.core.initialization import initialize_cog, init_callback + # from videoarchiver.core.cleanup import cleanup_resources + # from videoarchiver.utils.exceptions import ( VideoArchiverError, CommandError, EventError, diff --git a/videoarchiver/config/__init__.py b/videoarchiver/config/__init__.py index 92c6c09..396f4c9 100644 --- a/videoarchiver/config/__init__.py +++ b/videoarchiver/config/__init__.py @@ -18,7 +18,7 @@ try: from .validation_manager import ValidationManager except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.config.exceptions import ( + # from videoarchiver.config.exceptions import ( ConfigurationError, ValidationError, PermissionError, @@ -28,10 +28,10 @@ except ImportError: SchemaError, DiscordAPIError, ) - from videoarchiver.config.channel_manager import ChannelManager - from videoarchiver.config.role_manager import RoleManager - from videoarchiver.config.settings_formatter import SettingsFormatter - from videoarchiver.config.validation_manager import ValidationManager + # from videoarchiver.config.channel_manager import ChannelManager + # from videoarchiver.config.role_manager import RoleManager + # from videoarchiver.config.settings_formatter import SettingsFormatter + # from videoarchiver.config.validation_manager import ValidationManager __all__ = [ 'ConfigurationError', diff --git a/videoarchiver/config/channel_manager.py b/videoarchiver/config/channel_manager.py index 3b3b577..b18ab30 100644 --- a/videoarchiver/config/channel_manager.py +++ b/videoarchiver/config/channel_manager.py @@ -12,7 +12,7 @@ try: ) except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.config.exceptions import ( + # from videoarchiver.config.exceptions import ( ConfigurationError as ConfigError, DiscordAPIError, ) diff --git a/videoarchiver/config/role_manager.py b/videoarchiver/config/role_manager.py index a99d29a..6fc5164 100644 --- a/videoarchiver/config/role_manager.py +++ b/videoarchiver/config/role_manager.py @@ -9,7 +9,7 @@ try: from .exceptions import ConfigurationError as ConfigError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.config.exceptions import ConfigurationError as ConfigError + # from videoarchiver.config.exceptions import ConfigurationError as ConfigError logger = logging.getLogger("RoleManager") diff --git a/videoarchiver/config/settings_formatter.py b/videoarchiver/config/settings_formatter.py index 596ca79..24cc300 100644 --- a/videoarchiver/config/settings_formatter.py +++ b/videoarchiver/config/settings_formatter.py @@ -10,7 +10,7 @@ try: from .exceptions import ConfigurationError as ConfigError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.config.exceptions import ConfigurationError as ConfigError + # from videoarchiver.config.exceptions import ConfigurationError as ConfigError logger = logging.getLogger("SettingsFormatter") diff --git a/videoarchiver/config/validation_manager.py b/videoarchiver/config/validation_manager.py index fca4b4d..1e88cd9 100644 --- a/videoarchiver/config/validation_manager.py +++ b/videoarchiver/config/validation_manager.py @@ -8,7 +8,7 @@ try: from .exceptions import ConfigurationError as ConfigError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.config.exceptions import ConfigurationError as ConfigError + # from videoarchiver.config.exceptions import ConfigurationError as ConfigError logger = logging.getLogger("ConfigValidation") diff --git a/videoarchiver/config_manager.py b/videoarchiver/config_manager.py index 1742614..3a0473a 100644 --- a/videoarchiver/config_manager.py +++ b/videoarchiver/config_manager.py @@ -15,11 +15,11 @@ try: from .utils.exceptions import ConfigurationError as ConfigError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.config.validation_manager import ValidationManager - from videoarchiver.config.settings_formatter import SettingsFormatter - from videoarchiver.config.channel_manager import ChannelManager - from videoarchiver.config.role_manager import RoleManager - from videoarchiver.utils.exceptions import ConfigurationError as ConfigError + # from videoarchiver.config.validation_manager import ValidationManager + # from videoarchiver.config.settings_formatter import SettingsFormatter + # from videoarchiver.config.channel_manager import ChannelManager + # from videoarchiver.config.role_manager import RoleManager + # from videoarchiver.utils.exceptions import ConfigurationError as ConfigError logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/__init__.py b/videoarchiver/core/__init__.py index dbdfe53..b45d77f 100644 --- a/videoarchiver/core/__init__.py +++ b/videoarchiver/core/__init__.py @@ -5,6 +5,6 @@ try: from .base import VideoArchiver except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.core.base import VideoArchiver + # from videoarchiver.core.base import VideoArchiver __all__ = ["VideoArchiver"] diff --git a/videoarchiver/core/base.py b/videoarchiver/core/base.py index 847baa9..7996b9f 100644 --- a/videoarchiver/core/base.py +++ b/videoarchiver/core/base.py @@ -31,21 +31,21 @@ try: from ..utils.exceptions import CogError, ErrorContext, ErrorSeverity except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.core.settings import Settings - from videoarchiver.core.lifecycle import LifecycleManager, LifecycleState - from videoarchiver.core.component_manager import ComponentManager, ComponentState - from videoarchiver.core.error_handler import error_manager, handle_command_error - from videoarchiver.core.response_handler import ResponseManager - from videoarchiver.core.commands.archiver_commands import setup_archiver_commands - from videoarchiver.core.commands.database_commands import setup_database_commands - from videoarchiver.core.commands.settings_commands import setup_settings_commands - from videoarchiver.core.events import setup_events, EventManager - from videoarchiver.processor.core import VideoProcessor - from videoarchiver.queue.manager import EnhancedVideoQueueManager - from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager - from videoarchiver.database.video_archive_db import VideoArchiveDB - from videoarchiver.config_manager import ConfigManager - from videoarchiver.utils.exceptions import CogError, ErrorContext, ErrorSeverity + # from videoarchiver.core.settings import Settings + # from videoarchiver.core.lifecycle import LifecycleManager, LifecycleState + # from videoarchiver.core.component_manager import ComponentManager, ComponentState + # from videoarchiver.core.error_handler import error_manager, handle_command_error + # from videoarchiver.core.response_handler import ResponseManager + # from videoarchiver.core.commands.archiver_commands import setup_archiver_commands + # from videoarchiver.core.commands.database_commands import setup_database_commands + # from videoarchiver.core.commands.settings_commands import setup_settings_commands + # from videoarchiver.core.events import setup_events, EventManager + # from videoarchiver.processor.core import VideoProcessor + # from videoarchiver.queue.manager import EnhancedVideoQueueManager + # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager + # from videoarchiver.database.video_archive_db import VideoArchiveDB + # from videoarchiver.config_manager import ConfigManager + # from videoarchiver.utils.exceptions import CogError, ErrorContext, ErrorSeverity logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/cleanup.py b/videoarchiver/core/cleanup.py index 80df32a..b46cd12 100644 --- a/videoarchiver/core/cleanup.py +++ b/videoarchiver/core/cleanup.py @@ -14,14 +14,14 @@ try: from ..utils.exceptions import CleanupError, ErrorContext, ErrorSeverity except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.file_ops import cleanup_downloads - from videoarchiver.utils.exceptions import CleanupError, ErrorContext, ErrorSeverity + # from videoarchiver.utils.file_ops import cleanup_downloads + # from videoarchiver.utils.exceptions import CleanupError, ErrorContext, ErrorSeverity if TYPE_CHECKING: try: from .base import VideoArchiver except ImportError: - from videoarchiver.core.base import VideoArchiver + # from videoarchiver.core.base import VideoArchiver logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/commands.py b/videoarchiver/core/commands.py index 50c9ff1..167b99b 100644 --- a/videoarchiver/core/commands.py +++ b/videoarchiver/core/commands.py @@ -9,7 +9,7 @@ if TYPE_CHECKING: try: from .base import VideoArchiver except ImportError: - from videoarchiver.core.base import VideoArchiver + # from videoarchiver.core.base import VideoArchiver def setup_commands(cog: "VideoArchiver") -> None: """Command setup is now handled in the VideoArchiver class""" diff --git a/videoarchiver/core/component_manager.py b/videoarchiver/core/component_manager.py index 80b93d0..a9a7995 100644 --- a/videoarchiver/core/component_manager.py +++ b/videoarchiver/core/component_manager.py @@ -30,12 +30,12 @@ try: from ..ffmpeg.ffmpeg_manager import FFmpegManager except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity - from videoarchiver.utils.path_manager import PathManager - from videoarchiver.config_manager import ConfigManager - from videoarchiver.processor.core import VideoProcessor - from videoarchiver.queue.manager import EnhancedVideoQueueManager - from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager + # from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity + # from videoarchiver.utils.path_manager import PathManager + # from videoarchiver.config_manager import ConfigManager + # from videoarchiver.processor.core import VideoProcessor + # from videoarchiver.queue.manager import EnhancedVideoQueueManager + # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/error_handler.py b/videoarchiver/core/error_handler.py index cfb5e00..37e0dff 100644 --- a/videoarchiver/core/error_handler.py +++ b/videoarchiver/core/error_handler.py @@ -38,7 +38,7 @@ try: from ..core.response_handler import response_manager except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import ( + # from videoarchiver.utils.exceptions import ( VideoArchiverError, ErrorSeverity, ErrorContext, @@ -57,7 +57,7 @@ except ImportError: ResourceExhaustedError, ConfigurationError ) - from videoarchiver.core.response_handler import response_manager + # from videoarchiver.core.response_handler import response_manager logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/events.py b/videoarchiver/core/events.py index f6d6445..8a18910 100644 --- a/videoarchiver/core/events.py +++ b/videoarchiver/core/events.py @@ -19,18 +19,18 @@ try: from ..utils.exceptions import EventError, ErrorContext, ErrorSeverity except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.processor.constants import REACTIONS - from videoarchiver.processor.reactions import handle_archived_reaction - from videoarchiver.core.guild import initialize_guild_components, cleanup_guild_components - from videoarchiver.core.error_handler import ErrorManager - from videoarchiver.core.response_handler import response_manager - from videoarchiver.utils.exceptions import EventError, ErrorContext, ErrorSeverity + # from videoarchiver.processor.constants import REACTIONS + # from videoarchiver.processor.reactions import handle_archived_reaction + # from videoarchiver.core.guild import initialize_guild_components, cleanup_guild_components + # from videoarchiver.core.error_handler import ErrorManager + # from videoarchiver.core.response_handler import response_manager + # from videoarchiver.utils.exceptions import EventError, ErrorContext, ErrorSeverity if TYPE_CHECKING: try: from .base import VideoArchiver except ImportError: - from videoarchiver.core.base import VideoArchiver + # from videoarchiver.core.base import VideoArchiver logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/guild.py b/videoarchiver/core/guild.py index 6f08a3f..bf2e446 100644 --- a/videoarchiver/core/guild.py +++ b/videoarchiver/core/guild.py @@ -12,16 +12,16 @@ try: from ..utils.exceptions import VideoArchiverError as ProcessingError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.download_core import DownloadCore - from videoarchiver.utils.message_manager import MessageManager - from videoarchiver.utils.file_ops import cleanup_downloads - from videoarchiver.utils.exceptions import VideoArchiverError as ProcessingError + # from videoarchiver.utils.download_core import DownloadCore + # from videoarchiver.utils.message_manager import MessageManager + # from videoarchiver.utils.file_ops import cleanup_downloads + # from videoarchiver.utils.exceptions import VideoArchiverError as ProcessingError if TYPE_CHECKING: try: from .base import VideoArchiver except ImportError: - from videoarchiver.core.base import VideoArchiver + # from videoarchiver.core.base import VideoArchiver logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/initialization.py b/videoarchiver/core/initialization.py index 3259720..d3b810f 100644 --- a/videoarchiver/core/initialization.py +++ b/videoarchiver/core/initialization.py @@ -10,14 +10,14 @@ try: from .lifecycle import LifecycleState except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity - from videoarchiver.core.lifecycle import LifecycleState + # from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity + # from videoarchiver.core.lifecycle import LifecycleState if TYPE_CHECKING: try: from .base import VideoArchiver except ImportError: - from videoarchiver.core.base import VideoArchiver + # from videoarchiver.core.base import VideoArchiver logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/lifecycle.py b/videoarchiver/core/lifecycle.py index d078849..90d31c3 100644 --- a/videoarchiver/core/lifecycle.py +++ b/videoarchiver/core/lifecycle.py @@ -19,8 +19,8 @@ try: ) except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.core.cleanup import cleanup_resources, force_cleanup_resources - from videoarchiver.utils.exceptions import ( + # from videoarchiver.core.cleanup import cleanup_resources, force_cleanup_resources + # from videoarchiver.utils.exceptions import ( VideoArchiverError, ErrorContext, ErrorSeverity, diff --git a/videoarchiver/core/response_handler.py b/videoarchiver/core/response_handler.py index 527c582..7fefadb 100644 --- a/videoarchiver/core/response_handler.py +++ b/videoarchiver/core/response_handler.py @@ -12,7 +12,7 @@ try: from ..utils.exceptions import ErrorSeverity except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import ErrorSeverity + # from videoarchiver.utils.exceptions import ErrorSeverity logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/core/settings.py b/videoarchiver/core/settings.py index 429c09f..ba05b2f 100644 --- a/videoarchiver/core/settings.py +++ b/videoarchiver/core/settings.py @@ -9,7 +9,7 @@ try: from ..utils.exceptions import ConfigurationError, ErrorContext, ErrorSeverity except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import ConfigurationError, ErrorContext, ErrorSeverity + # from videoarchiver.utils.exceptions import ConfigurationError, ErrorContext, ErrorSeverity class VideoFormat(Enum): diff --git a/videoarchiver/database/__init__.py b/videoarchiver/database/__init__.py index c4bed38..e4cb070 100644 --- a/videoarchiver/database/__init__.py +++ b/videoarchiver/database/__init__.py @@ -8,10 +8,10 @@ try: from .video_archive_db import VideoArchiveDB except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.database.connection_manager import DatabaseConnectionManager - from videoarchiver.database.query_manager import DatabaseQueryManager - from videoarchiver.database.schema_manager import DatabaseSchemaManager - from videoarchiver.database.video_archive_db import VideoArchiveDB + # from videoarchiver.database.connection_manager import DatabaseConnectionManager + # from videoarchiver.database.query_manager import DatabaseQueryManager + # from videoarchiver.database.schema_manager import DatabaseSchemaManager + # from videoarchiver.database.video_archive_db import VideoArchiveDB __all__ = [ 'DatabaseConnectionManager', diff --git a/videoarchiver/database/connection_manager.py b/videoarchiver/database/connection_manager.py index 7812f2e..7b11ba4 100644 --- a/videoarchiver/database/connection_manager.py +++ b/videoarchiver/database/connection_manager.py @@ -15,7 +15,7 @@ try: from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity + # from videoarchiver.utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity logger = logging.getLogger("DBConnectionManager") diff --git a/videoarchiver/database/schema_manager.py b/videoarchiver/database/schema_manager.py index 198eb0e..3989c7d 100644 --- a/videoarchiver/database/schema_manager.py +++ b/videoarchiver/database/schema_manager.py @@ -12,7 +12,7 @@ try: from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity + # from videoarchiver.utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity logger = logging.getLogger("DBSchemaManager") diff --git a/videoarchiver/database/video_archive_db.py b/videoarchiver/database/video_archive_db.py index a47757f..ba4e38b 100644 --- a/videoarchiver/database/video_archive_db.py +++ b/videoarchiver/database/video_archive_db.py @@ -11,9 +11,9 @@ try: from .connection_manager import DatabaseConnectionManager except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.database.schema_manager import DatabaseSchemaManager - from videoarchiver.database.query_manager import DatabaseQueryManager - from videoarchiver.database.connection_manager import DatabaseConnectionManager + # from videoarchiver.database.schema_manager import DatabaseSchemaManager + # from videoarchiver.database.query_manager import DatabaseQueryManager + # from videoarchiver.database.connection_manager import DatabaseConnectionManager logger = logging.getLogger("VideoArchiverDB") diff --git a/videoarchiver/ffmpeg/__init__.py b/videoarchiver/ffmpeg/__init__.py index aad0ea3..a7ccd4c 100644 --- a/videoarchiver/ffmpeg/__init__.py +++ b/videoarchiver/ffmpeg/__init__.py @@ -46,12 +46,12 @@ try: ) except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager - from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer - from videoarchiver.ffmpeg.gpu_detector import GPUDetector - from videoarchiver.ffmpeg.encoder_params import EncoderParams - from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader - from videoarchiver.ffmpeg.exceptions import ( + # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager + # from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer + # from videoarchiver.ffmpeg.gpu_detector import GPUDetector + # from videoarchiver.ffmpeg.encoder_params import EncoderParams + # from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader + # from videoarchiver.ffmpeg.exceptions import ( FFmpegError, DownloadError, VerificationError, diff --git a/videoarchiver/ffmpeg/binary_manager.py b/videoarchiver/ffmpeg/binary_manager.py index 1f9d91a..a18af29 100644 --- a/videoarchiver/ffmpeg/binary_manager.py +++ b/videoarchiver/ffmpeg/binary_manager.py @@ -18,15 +18,15 @@ try: from .verification_manager import VerificationManager except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.ffmpeg.exceptions import ( + # from videoarchiver.ffmpeg.exceptions import ( FFmpegError, DownloadError, VerificationError, PermissionError, FFmpegNotFoundError ) - from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader - from videoarchiver.ffmpeg.verification_manager import VerificationManager + # from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader + # from videoarchiver.ffmpeg.verification_manager import VerificationManager logger = logging.getLogger("FFmpegBinaryManager") diff --git a/videoarchiver/ffmpeg/encoder_params.py b/videoarchiver/ffmpeg/encoder_params.py index 217dcaf..a865192 100644 --- a/videoarchiver/ffmpeg/encoder_params.py +++ b/videoarchiver/ffmpeg/encoder_params.py @@ -9,7 +9,7 @@ try: from .exceptions import CompressionError, QualityError, BitrateError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.ffmpeg.exceptions import CompressionError, QualityError, BitrateError + # from videoarchiver.ffmpeg.exceptions import CompressionError, QualityError, BitrateError logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/ffmpeg/ffmpeg_downloader.py b/videoarchiver/ffmpeg/ffmpeg_downloader.py index 8c2bb03..16cc38c 100644 --- a/videoarchiver/ffmpeg/ffmpeg_downloader.py +++ b/videoarchiver/ffmpeg/ffmpeg_downloader.py @@ -21,7 +21,7 @@ try: from .exceptions import DownloadError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.ffmpeg.exceptions import DownloadError + # from videoarchiver.ffmpeg.exceptions import DownloadError logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/ffmpeg/ffmpeg_manager.py b/videoarchiver/ffmpeg/ffmpeg_manager.py index eb07fe1..06ed405 100644 --- a/videoarchiver/ffmpeg/ffmpeg_manager.py +++ b/videoarchiver/ffmpeg/ffmpeg_manager.py @@ -21,17 +21,17 @@ try: from .binary_manager import BinaryManager except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.ffmpeg.exceptions import ( + # from videoarchiver.ffmpeg.exceptions import ( FFmpegError, AnalysisError, FFmpegNotFoundError ) - from videoarchiver.ffmpeg.gpu_detector import GPUDetector - from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer - from videoarchiver.ffmpeg.encoder_params import EncoderParams - from videoarchiver.ffmpeg.process_manager import ProcessManager - from videoarchiver.ffmpeg.verification_manager import VerificationManager - from videoarchiver.ffmpeg.binary_manager import BinaryManager + # from videoarchiver.ffmpeg.gpu_detector import GPUDetector + # from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer + # from videoarchiver.ffmpeg.encoder_params import EncoderParams + # from videoarchiver.ffmpeg.process_manager import ProcessManager + # from videoarchiver.ffmpeg.verification_manager import VerificationManager + # from videoarchiver.ffmpeg.binary_manager import BinaryManager logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/ffmpeg/verification_manager.py b/videoarchiver/ffmpeg/verification_manager.py index 56a852f..33130db 100644 --- a/videoarchiver/ffmpeg/verification_manager.py +++ b/videoarchiver/ffmpeg/verification_manager.py @@ -16,7 +16,7 @@ try: ) except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.ffmpeg.exceptions import ( + # from videoarchiver.ffmpeg.exceptions import ( TimeoutError, VerificationError, EncodingError, diff --git a/videoarchiver/processor/cleanup_manager.py b/videoarchiver/processor/cleanup_manager.py index 1b52c0a..0de5594 100644 --- a/videoarchiver/processor/cleanup_manager.py +++ b/videoarchiver/processor/cleanup_manager.py @@ -28,8 +28,8 @@ if TYPE_CHECKING: from ..utils.exceptions import CleanupError # except ImportError: # Fall back to absolute imports if relative imports fail -# from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager -# from videoarchiver.utils.exceptions import CleanupError +# # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager +# # from videoarchiver.utils.exceptions import CleanupError logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/processor/core.py b/videoarchiver/processor/core.py index 6e0237f..94791a2 100644 --- a/videoarchiver/processor/core.py +++ b/videoarchiver/processor/core.py @@ -8,10 +8,10 @@ from typing import Any, ClassVar, Dict, List, Optional, Tuple, TYPE_CHECKING import discord # type: ignore from discord.ext import commands # type: ignore -from videoarchiver.core.types import ComponentState, ProcessorState, ComponentStatus, IComponent, IConfigManager, IQueueManager -from videoarchiver.processor.constants import REACTIONS -from videoarchiver.utils.progress_tracker import ProgressTracker -from videoarchiver.utils.exceptions import ProcessorError +# from videoarchiver.core.types import ComponentState, ProcessorState, ComponentStatus, IComponent, IConfigManager, IQueueManager +# from videoarchiver.processor.constants import REACTIONS +# from videoarchiver.utils.progress_tracker import ProgressTracker +# from videoarchiver.utils.exceptions import ProcessorError logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/processor/message_handler.py b/videoarchiver/processor/message_handler.py index 5083150..281e6d7 100644 --- a/videoarchiver/processor/message_handler.py +++ b/videoarchiver/processor/message_handler.py @@ -19,18 +19,18 @@ try: from ..utils.exceptions import MessageHandlerError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.config_manager import ConfigManager - from videoarchiver.processor.constants import REACTIONS - from videoarchiver.processor.message_validator import MessageValidator, ValidationError - from videoarchiver.processor.url_extractor import URLExtractor, URLMetadata - from videoarchiver.queue.types import QueuePriority - from videoarchiver.utils.exceptions import MessageHandlerError + # from videoarchiver.config_manager import ConfigManager + # from videoarchiver.processor.constants import REACTIONS + # from videoarchiver.processor.message_validator import MessageValidator, ValidationError + # from videoarchiver.processor.url_extractor import URLExtractor, URLMetadata + # from videoarchiver.queue.types import QueuePriority + # from videoarchiver.utils.exceptions import MessageHandlerError if TYPE_CHECKING: try: from ..queue.manager import EnhancedVideoQueueManager except ImportError: - from videoarchiver.queue.manager import EnhancedVideoQueueManager + # from videoarchiver.queue.manager import EnhancedVideoQueueManager logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/processor/message_validator.py b/videoarchiver/processor/message_validator.py index 1c4ada3..3e0f0b9 100644 --- a/videoarchiver/processor/message_validator.py +++ b/videoarchiver/processor/message_validator.py @@ -12,7 +12,7 @@ try: from ..utils.exceptions import ValidationError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import ValidationError + # from videoarchiver.utils.exceptions import ValidationError logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/processor/queue_handler.py b/videoarchiver/processor/queue_handler.py index cc07621..9b5235e 100644 --- a/videoarchiver/processor/queue_handler.py +++ b/videoarchiver/processor/queue_handler.py @@ -21,14 +21,14 @@ try: from .constants import REACTIONS except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.database.video_archive_db import VideoArchiveDB - from videoarchiver.utils.download_manager import DownloadManager - from videoarchiver.utils.message_manager import MessageManager - from videoarchiver.utils.exceptions import QueueHandlerError - from videoarchiver.queue.models import QueueItem - from videoarchiver.config_manager import ConfigManager - from videoarchiver.processor import progress_tracker # Import from processor package - from videoarchiver.processor.constants import REACTIONS + # from videoarchiver.database.video_archive_db import VideoArchiveDB + # from videoarchiver.utils.download_manager import DownloadManager + # from videoarchiver.utils.message_manager import MessageManager + # from videoarchiver.utils.exceptions import QueueHandlerError + # from videoarchiver.queue.models import QueueItem + # from videoarchiver.config_manager import ConfigManager + # from videoarchiver.processor import progress_tracker # Import from processor package + # from videoarchiver.processor.constants import REACTIONS logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/processor/queue_processor.py b/videoarchiver/processor/queue_processor.py index 93b1ac9..01bbfcd 100644 --- a/videoarchiver/processor/queue_processor.py +++ b/videoarchiver/processor/queue_processor.py @@ -11,8 +11,8 @@ try: from ..queue.models import QueueItem except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.queue.types import QueuePriority, QueueMetrics, ProcessingMetrics - from videoarchiver.queue.models import QueueItem + # from videoarchiver.queue.types import QueuePriority, QueueMetrics, ProcessingMetrics + # from videoarchiver.queue.models import QueueItem logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/processor/reactions.py b/videoarchiver/processor/reactions.py index a168cfc..483c0a9 100644 --- a/videoarchiver/processor/reactions.py +++ b/videoarchiver/processor/reactions.py @@ -18,13 +18,13 @@ try: from ..database.video_archive_db import VideoArchiveDB except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.processor.constants import ( + # from videoarchiver.processor.constants import ( REACTIONS, ReactionType, get_reaction, get_progress_emoji, ) - from videoarchiver.database.video_archive_db import VideoArchiveDB + # from videoarchiver.database.video_archive_db import VideoArchiveDB logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/processor/status_display.py b/videoarchiver/processor/status_display.py index 3aa7c4e..3a9703e 100644 --- a/videoarchiver/processor/status_display.py +++ b/videoarchiver/processor/status_display.py @@ -23,7 +23,7 @@ try: from ..utils.exceptions import DisplayError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import DisplayError + # from videoarchiver.utils.exceptions import DisplayError logger = logging.getLogger("VideoArchiver") diff --git a/videoarchiver/update_checker.py b/videoarchiver/update_checker.py index e3a28bf..be25a03 100644 --- a/videoarchiver/update_checker.py +++ b/videoarchiver/update_checker.py @@ -21,7 +21,7 @@ try: from .utils.exceptions import UpdateError except ImportError: # Fall back to absolute imports if relative imports fail - from videoarchiver.utils.exceptions import UpdateError + # from videoarchiver.utils.exceptions import UpdateError logger = logging.getLogger("VideoArchiver")