ch ch ch changes

This commit is contained in:
pacnpal
2024-11-18 01:01:12 +00:00
parent e296f2440c
commit d03e8dc8e8
38 changed files with 121 additions and 121 deletions

View File

@@ -98,10 +98,10 @@ except ImportError:
from videoarchiver import database from videoarchiver import database
from videoarchiver import config from videoarchiver import config
from videoarchiver import core from videoarchiver import core
from videoarchiver.core.base import VideoArchiver # from videoarchiver.core.base import VideoArchiver
from videoarchiver.core.initialization import initialize_cog, init_callback # from videoarchiver.core.initialization import initialize_cog, init_callback
from videoarchiver.core.cleanup import cleanup_resources # from videoarchiver.core.cleanup import cleanup_resources
from videoarchiver.utils.exceptions import ( # from videoarchiver.utils.exceptions import (
VideoArchiverError, VideoArchiverError,
CommandError, CommandError,
EventError, EventError,

View File

@@ -18,7 +18,7 @@ try:
from .validation_manager import ValidationManager from .validation_manager import ValidationManager
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.config.exceptions import ( # from videoarchiver.config.exceptions import (
ConfigurationError, ConfigurationError,
ValidationError, ValidationError,
PermissionError, PermissionError,
@@ -28,10 +28,10 @@ except ImportError:
SchemaError, SchemaError,
DiscordAPIError, DiscordAPIError,
) )
from videoarchiver.config.channel_manager import ChannelManager # from videoarchiver.config.channel_manager import ChannelManager
from videoarchiver.config.role_manager import RoleManager # from videoarchiver.config.role_manager import RoleManager
from videoarchiver.config.settings_formatter import SettingsFormatter # from videoarchiver.config.settings_formatter import SettingsFormatter
from videoarchiver.config.validation_manager import ValidationManager # from videoarchiver.config.validation_manager import ValidationManager
__all__ = [ __all__ = [
'ConfigurationError', 'ConfigurationError',

View File

@@ -12,7 +12,7 @@ try:
) )
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.config.exceptions import ( # from videoarchiver.config.exceptions import (
ConfigurationError as ConfigError, ConfigurationError as ConfigError,
DiscordAPIError, DiscordAPIError,
) )

View File

@@ -9,7 +9,7 @@ try:
from .exceptions import ConfigurationError as ConfigError from .exceptions import ConfigurationError as ConfigError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("RoleManager")

View File

@@ -10,7 +10,7 @@ try:
from .exceptions import ConfigurationError as ConfigError from .exceptions import ConfigurationError as ConfigError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("SettingsFormatter")

View File

@@ -8,7 +8,7 @@ try:
from .exceptions import ConfigurationError as ConfigError from .exceptions import ConfigurationError as ConfigError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("ConfigValidation")

View File

@@ -15,11 +15,11 @@ try:
from .utils.exceptions import ConfigurationError as ConfigError from .utils.exceptions import ConfigurationError as ConfigError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.config.validation_manager import ValidationManager # from videoarchiver.config.validation_manager import ValidationManager
from videoarchiver.config.settings_formatter import SettingsFormatter # from videoarchiver.config.settings_formatter import SettingsFormatter
from videoarchiver.config.channel_manager import ChannelManager # from videoarchiver.config.channel_manager import ChannelManager
from videoarchiver.config.role_manager import RoleManager # from videoarchiver.config.role_manager import RoleManager
from videoarchiver.utils.exceptions import ConfigurationError as ConfigError # from videoarchiver.utils.exceptions import ConfigurationError as ConfigError
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -5,6 +5,6 @@ try:
from .base import VideoArchiver from .base import VideoArchiver
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.core.base import VideoArchiver # from videoarchiver.core.base import VideoArchiver
__all__ = ["VideoArchiver"] __all__ = ["VideoArchiver"]

View File

@@ -31,21 +31,21 @@ try:
from ..utils.exceptions import CogError, ErrorContext, ErrorSeverity from ..utils.exceptions import CogError, ErrorContext, ErrorSeverity
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.core.settings import Settings # from videoarchiver.core.settings import Settings
from videoarchiver.core.lifecycle import LifecycleManager, LifecycleState # from videoarchiver.core.lifecycle import LifecycleManager, LifecycleState
from videoarchiver.core.component_manager import ComponentManager, ComponentState # from videoarchiver.core.component_manager import ComponentManager, ComponentState
from videoarchiver.core.error_handler import error_manager, handle_command_error # from videoarchiver.core.error_handler import error_manager, handle_command_error
from videoarchiver.core.response_handler import ResponseManager # from videoarchiver.core.response_handler import ResponseManager
from videoarchiver.core.commands.archiver_commands import setup_archiver_commands # from videoarchiver.core.commands.archiver_commands import setup_archiver_commands
from videoarchiver.core.commands.database_commands import setup_database_commands # from videoarchiver.core.commands.database_commands import setup_database_commands
from videoarchiver.core.commands.settings_commands import setup_settings_commands # from videoarchiver.core.commands.settings_commands import setup_settings_commands
from videoarchiver.core.events import setup_events, EventManager # from videoarchiver.core.events import setup_events, EventManager
from videoarchiver.processor.core import VideoProcessor # from videoarchiver.processor.core import VideoProcessor
from videoarchiver.queue.manager import EnhancedVideoQueueManager # from videoarchiver.queue.manager import EnhancedVideoQueueManager
from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager
from videoarchiver.database.video_archive_db import VideoArchiveDB # from videoarchiver.database.video_archive_db import VideoArchiveDB
from videoarchiver.config_manager import ConfigManager # from videoarchiver.config_manager import ConfigManager
from videoarchiver.utils.exceptions import CogError, ErrorContext, ErrorSeverity # from videoarchiver.utils.exceptions import CogError, ErrorContext, ErrorSeverity
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -14,14 +14,14 @@ try:
from ..utils.exceptions import CleanupError, ErrorContext, ErrorSeverity from ..utils.exceptions import CleanupError, ErrorContext, ErrorSeverity
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.utils.file_ops import cleanup_downloads # from videoarchiver.utils.file_ops import cleanup_downloads
from videoarchiver.utils.exceptions import CleanupError, ErrorContext, ErrorSeverity # from videoarchiver.utils.exceptions import CleanupError, ErrorContext, ErrorSeverity
if TYPE_CHECKING: if TYPE_CHECKING:
try: try:
from .base import VideoArchiver from .base import VideoArchiver
except ImportError: except ImportError:
from videoarchiver.core.base import VideoArchiver # from videoarchiver.core.base import VideoArchiver
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -9,7 +9,7 @@ if TYPE_CHECKING:
try: try:
from .base import VideoArchiver from .base import VideoArchiver
except ImportError: except ImportError:
from videoarchiver.core.base import VideoArchiver # from videoarchiver.core.base import VideoArchiver
def setup_commands(cog: "VideoArchiver") -> None: def setup_commands(cog: "VideoArchiver") -> None:
"""Command setup is now handled in the VideoArchiver class""" """Command setup is now handled in the VideoArchiver class"""

View File

@@ -30,12 +30,12 @@ try:
from ..ffmpeg.ffmpeg_manager import FFmpegManager from ..ffmpeg.ffmpeg_manager import FFmpegManager
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity # from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity
from videoarchiver.utils.path_manager import PathManager # from videoarchiver.utils.path_manager import PathManager
from videoarchiver.config_manager import ConfigManager # from videoarchiver.config_manager import ConfigManager
from videoarchiver.processor.core import VideoProcessor # from videoarchiver.processor.core import VideoProcessor
from videoarchiver.queue.manager import EnhancedVideoQueueManager # from videoarchiver.queue.manager import EnhancedVideoQueueManager
from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -38,7 +38,7 @@ try:
from ..core.response_handler import response_manager from ..core.response_handler import response_manager
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.utils.exceptions import ( # from videoarchiver.utils.exceptions import (
VideoArchiverError, VideoArchiverError,
ErrorSeverity, ErrorSeverity,
ErrorContext, ErrorContext,
@@ -57,7 +57,7 @@ except ImportError:
ResourceExhaustedError, ResourceExhaustedError,
ConfigurationError ConfigurationError
) )
from videoarchiver.core.response_handler import response_manager # from videoarchiver.core.response_handler import response_manager
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -19,18 +19,18 @@ try:
from ..utils.exceptions import EventError, ErrorContext, ErrorSeverity from ..utils.exceptions import EventError, ErrorContext, ErrorSeverity
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.processor.constants import REACTIONS # from videoarchiver.processor.constants import REACTIONS
from videoarchiver.processor.reactions import handle_archived_reaction # from videoarchiver.processor.reactions import handle_archived_reaction
from videoarchiver.core.guild import initialize_guild_components, cleanup_guild_components # from videoarchiver.core.guild import initialize_guild_components, cleanup_guild_components
from videoarchiver.core.error_handler import ErrorManager # from videoarchiver.core.error_handler import ErrorManager
from videoarchiver.core.response_handler import response_manager # from videoarchiver.core.response_handler import response_manager
from videoarchiver.utils.exceptions import EventError, ErrorContext, ErrorSeverity # from videoarchiver.utils.exceptions import EventError, ErrorContext, ErrorSeverity
if TYPE_CHECKING: if TYPE_CHECKING:
try: try:
from .base import VideoArchiver from .base import VideoArchiver
except ImportError: except ImportError:
from videoarchiver.core.base import VideoArchiver # from videoarchiver.core.base import VideoArchiver
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -12,16 +12,16 @@ try:
from ..utils.exceptions import VideoArchiverError as ProcessingError from ..utils.exceptions import VideoArchiverError as ProcessingError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.utils.download_core import DownloadCore # from videoarchiver.utils.download_core import DownloadCore
from videoarchiver.utils.message_manager import MessageManager # from videoarchiver.utils.message_manager import MessageManager
from videoarchiver.utils.file_ops import cleanup_downloads # from videoarchiver.utils.file_ops import cleanup_downloads
from videoarchiver.utils.exceptions import VideoArchiverError as ProcessingError # from videoarchiver.utils.exceptions import VideoArchiverError as ProcessingError
if TYPE_CHECKING: if TYPE_CHECKING:
try: try:
from .base import VideoArchiver from .base import VideoArchiver
except ImportError: except ImportError:
from videoarchiver.core.base import VideoArchiver # from videoarchiver.core.base import VideoArchiver
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -10,14 +10,14 @@ try:
from .lifecycle import LifecycleState from .lifecycle import LifecycleState
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity # from videoarchiver.utils.exceptions import ComponentError, ErrorContext, ErrorSeverity
from videoarchiver.core.lifecycle import LifecycleState # from videoarchiver.core.lifecycle import LifecycleState
if TYPE_CHECKING: if TYPE_CHECKING:
try: try:
from .base import VideoArchiver from .base import VideoArchiver
except ImportError: except ImportError:
from videoarchiver.core.base import VideoArchiver # from videoarchiver.core.base import VideoArchiver
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -19,8 +19,8 @@ try:
) )
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.core.cleanup import cleanup_resources, force_cleanup_resources # from videoarchiver.core.cleanup import cleanup_resources, force_cleanup_resources
from videoarchiver.utils.exceptions import ( # from videoarchiver.utils.exceptions import (
VideoArchiverError, VideoArchiverError,
ErrorContext, ErrorContext,
ErrorSeverity, ErrorSeverity,

View File

@@ -12,7 +12,7 @@ try:
from ..utils.exceptions import ErrorSeverity from ..utils.exceptions import ErrorSeverity
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("VideoArchiver")

View File

@@ -9,7 +9,7 @@ try:
from ..utils.exceptions import ConfigurationError, ErrorContext, ErrorSeverity from ..utils.exceptions import ConfigurationError, ErrorContext, ErrorSeverity
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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): class VideoFormat(Enum):

View File

@@ -8,10 +8,10 @@ try:
from .video_archive_db import VideoArchiveDB from .video_archive_db import VideoArchiveDB
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.database.connection_manager import DatabaseConnectionManager # from videoarchiver.database.connection_manager import DatabaseConnectionManager
from videoarchiver.database.query_manager import DatabaseQueryManager # from videoarchiver.database.query_manager import DatabaseQueryManager
from videoarchiver.database.schema_manager import DatabaseSchemaManager # from videoarchiver.database.schema_manager import DatabaseSchemaManager
from videoarchiver.database.video_archive_db import VideoArchiveDB # from videoarchiver.database.video_archive_db import VideoArchiveDB
__all__ = [ __all__ = [
'DatabaseConnectionManager', 'DatabaseConnectionManager',

View File

@@ -15,7 +15,7 @@ try:
from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("DBConnectionManager")

View File

@@ -12,7 +12,7 @@ try:
from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("DBSchemaManager")

View File

@@ -11,9 +11,9 @@ try:
from .connection_manager import DatabaseConnectionManager from .connection_manager import DatabaseConnectionManager
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.database.schema_manager import DatabaseSchemaManager # from videoarchiver.database.schema_manager import DatabaseSchemaManager
from videoarchiver.database.query_manager import DatabaseQueryManager # from videoarchiver.database.query_manager import DatabaseQueryManager
from videoarchiver.database.connection_manager import DatabaseConnectionManager # from videoarchiver.database.connection_manager import DatabaseConnectionManager
logger = logging.getLogger("VideoArchiverDB") logger = logging.getLogger("VideoArchiverDB")

View File

@@ -46,12 +46,12 @@ try:
) )
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager
from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer # from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer
from videoarchiver.ffmpeg.gpu_detector import GPUDetector # from videoarchiver.ffmpeg.gpu_detector import GPUDetector
from videoarchiver.ffmpeg.encoder_params import EncoderParams # from videoarchiver.ffmpeg.encoder_params import EncoderParams
from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader # from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader
from videoarchiver.ffmpeg.exceptions import ( # from videoarchiver.ffmpeg.exceptions import (
FFmpegError, FFmpegError,
DownloadError, DownloadError,
VerificationError, VerificationError,

View File

@@ -18,15 +18,15 @@ try:
from .verification_manager import VerificationManager from .verification_manager import VerificationManager
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.ffmpeg.exceptions import ( # from videoarchiver.ffmpeg.exceptions import (
FFmpegError, FFmpegError,
DownloadError, DownloadError,
VerificationError, VerificationError,
PermissionError, PermissionError,
FFmpegNotFoundError FFmpegNotFoundError
) )
from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader # from videoarchiver.ffmpeg.ffmpeg_downloader import FFmpegDownloader
from videoarchiver.ffmpeg.verification_manager import VerificationManager # from videoarchiver.ffmpeg.verification_manager import VerificationManager
logger = logging.getLogger("FFmpegBinaryManager") logger = logging.getLogger("FFmpegBinaryManager")

View File

@@ -9,7 +9,7 @@ try:
from .exceptions import CompressionError, QualityError, BitrateError from .exceptions import CompressionError, QualityError, BitrateError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("VideoArchiver")

View File

@@ -21,7 +21,7 @@ try:
from .exceptions import DownloadError from .exceptions import DownloadError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("VideoArchiver")

View File

@@ -21,17 +21,17 @@ try:
from .binary_manager import BinaryManager from .binary_manager import BinaryManager
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.ffmpeg.exceptions import ( # from videoarchiver.ffmpeg.exceptions import (
FFmpegError, FFmpegError,
AnalysisError, AnalysisError,
FFmpegNotFoundError FFmpegNotFoundError
) )
from videoarchiver.ffmpeg.gpu_detector import GPUDetector # from videoarchiver.ffmpeg.gpu_detector import GPUDetector
from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer # from videoarchiver.ffmpeg.video_analyzer import VideoAnalyzer
from videoarchiver.ffmpeg.encoder_params import EncoderParams # from videoarchiver.ffmpeg.encoder_params import EncoderParams
from videoarchiver.ffmpeg.process_manager import ProcessManager # from videoarchiver.ffmpeg.process_manager import ProcessManager
from videoarchiver.ffmpeg.verification_manager import VerificationManager # from videoarchiver.ffmpeg.verification_manager import VerificationManager
from videoarchiver.ffmpeg.binary_manager import BinaryManager # from videoarchiver.ffmpeg.binary_manager import BinaryManager
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -16,7 +16,7 @@ try:
) )
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.ffmpeg.exceptions import ( # from videoarchiver.ffmpeg.exceptions import (
TimeoutError, TimeoutError,
VerificationError, VerificationError,
EncodingError, EncodingError,

View File

@@ -28,8 +28,8 @@ if TYPE_CHECKING:
from ..utils.exceptions import CleanupError from ..utils.exceptions import CleanupError
# except ImportError: # except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
# from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager # # from videoarchiver.ffmpeg.ffmpeg_manager import FFmpegManager
# from videoarchiver.utils.exceptions import CleanupError # # from videoarchiver.utils.exceptions import CleanupError
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -8,10 +8,10 @@ from typing import Any, ClassVar, Dict, List, Optional, Tuple, TYPE_CHECKING
import discord # type: ignore import discord # type: ignore
from discord.ext import commands # type: ignore from discord.ext import commands # type: ignore
from videoarchiver.core.types import ComponentState, ProcessorState, ComponentStatus, IComponent, IConfigManager, IQueueManager # from videoarchiver.core.types import ComponentState, ProcessorState, ComponentStatus, IComponent, IConfigManager, IQueueManager
from videoarchiver.processor.constants import REACTIONS # from videoarchiver.processor.constants import REACTIONS
from videoarchiver.utils.progress_tracker import ProgressTracker # from videoarchiver.utils.progress_tracker import ProgressTracker
from videoarchiver.utils.exceptions import ProcessorError # from videoarchiver.utils.exceptions import ProcessorError
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -19,18 +19,18 @@ try:
from ..utils.exceptions import MessageHandlerError from ..utils.exceptions import MessageHandlerError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.config_manager import ConfigManager # from videoarchiver.config_manager import ConfigManager
from videoarchiver.processor.constants import REACTIONS # from videoarchiver.processor.constants import REACTIONS
from videoarchiver.processor.message_validator import MessageValidator, ValidationError # from videoarchiver.processor.message_validator import MessageValidator, ValidationError
from videoarchiver.processor.url_extractor import URLExtractor, URLMetadata # from videoarchiver.processor.url_extractor import URLExtractor, URLMetadata
from videoarchiver.queue.types import QueuePriority # from videoarchiver.queue.types import QueuePriority
from videoarchiver.utils.exceptions import MessageHandlerError # from videoarchiver.utils.exceptions import MessageHandlerError
if TYPE_CHECKING: if TYPE_CHECKING:
try: try:
from ..queue.manager import EnhancedVideoQueueManager from ..queue.manager import EnhancedVideoQueueManager
except ImportError: except ImportError:
from videoarchiver.queue.manager import EnhancedVideoQueueManager # from videoarchiver.queue.manager import EnhancedVideoQueueManager
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -12,7 +12,7 @@ try:
from ..utils.exceptions import ValidationError from ..utils.exceptions import ValidationError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("VideoArchiver")

View File

@@ -21,14 +21,14 @@ try:
from .constants import REACTIONS from .constants import REACTIONS
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.database.video_archive_db import VideoArchiveDB # from videoarchiver.database.video_archive_db import VideoArchiveDB
from videoarchiver.utils.download_manager import DownloadManager # from videoarchiver.utils.download_manager import DownloadManager
from videoarchiver.utils.message_manager import MessageManager # from videoarchiver.utils.message_manager import MessageManager
from videoarchiver.utils.exceptions import QueueHandlerError # from videoarchiver.utils.exceptions import QueueHandlerError
from videoarchiver.queue.models import QueueItem # from videoarchiver.queue.models import QueueItem
from videoarchiver.config_manager import ConfigManager # from videoarchiver.config_manager import ConfigManager
from videoarchiver.processor import progress_tracker # Import from processor package # from videoarchiver.processor import progress_tracker # Import from processor package
from videoarchiver.processor.constants import REACTIONS # from videoarchiver.processor.constants import REACTIONS
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -11,8 +11,8 @@ try:
from ..queue.models import QueueItem from ..queue.models import QueueItem
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.queue.types import QueuePriority, QueueMetrics, ProcessingMetrics # from videoarchiver.queue.types import QueuePriority, QueueMetrics, ProcessingMetrics
from videoarchiver.queue.models import QueueItem # from videoarchiver.queue.models import QueueItem
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -18,13 +18,13 @@ try:
from ..database.video_archive_db import VideoArchiveDB from ..database.video_archive_db import VideoArchiveDB
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # Fall back to absolute imports if relative imports fail
from videoarchiver.processor.constants import ( # from videoarchiver.processor.constants import (
REACTIONS, REACTIONS,
ReactionType, ReactionType,
get_reaction, get_reaction,
get_progress_emoji, get_progress_emoji,
) )
from videoarchiver.database.video_archive_db import VideoArchiveDB # from videoarchiver.database.video_archive_db import VideoArchiveDB
logger = logging.getLogger("VideoArchiver") logger = logging.getLogger("VideoArchiver")

View File

@@ -23,7 +23,7 @@ try:
from ..utils.exceptions import DisplayError from ..utils.exceptions import DisplayError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("VideoArchiver")

View File

@@ -21,7 +21,7 @@ try:
from .utils.exceptions import UpdateError from .utils.exceptions import UpdateError
except ImportError: except ImportError:
# Fall back to absolute imports if relative imports fail # 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") logger = logging.getLogger("VideoArchiver")