This commit is contained in:
pacnpal
2024-11-18 05:31:47 +00:00
parent df9099f2c8
commit 15c17612bc
3 changed files with 62 additions and 36 deletions

View File

@@ -1,11 +1,37 @@
"""Core module for VideoArchiver cog""" """Core module for VideoArchiver"""
# try: from .base import VideoArchiver
# Try relative imports first from .commands import (
from base import VideoArchiver ArchiverCommands,
DatabaseCommands,
SettingsCommands
)
from .component_manager import ComponentManager
from .error_handler import ErrorHandler
from .events import EventHandler
from .initialization import initialize_cog
from .lifecycle import LifecycleManager
from .response_handler import ResponseHandler
from .settings import Settings
from .c_types import (
IQueueManager,
QueueState,
ComponentStatus
)
# except ImportError: __all__ = [
# Fall back to absolute imports if relative imports fail "VideoArchiver",
# from videoarchiver.core.base import VideoArchiver "ArchiverCommands",
"DatabaseCommands",
__all__ = ["VideoArchiver"] "SettingsCommands",
"ComponentManager",
"ErrorHandler",
"EventHandler",
"initialize_cog",
"LifecycleManager",
"ResponseHandler",
"Settings",
"IQueueManager",
"QueueState",
"ComponentStatus"
]

View File

@@ -1,27 +1,27 @@
"""Queue management package for video processing""" """Queue management package for video processing"""
from models import QueueItem, QueueMetrics from .models import QueueItem, QueueMetrics
from q_types import QueuePriority, ProcessingMetrics from .q_types import QueuePriority, ProcessingMetrics
from manager import EnhancedVideoQueueManager from .manager import EnhancedVideoQueueManager
from persistence import QueuePersistenceManager, QueueError from .persistence import QueuePersistenceManager, QueueError
from monitoring import QueueMonitor, MonitoringError from .monitoring import QueueMonitor, MonitoringError
from cleanup import QueueCleaner, CleanupError from .cleanup import QueueCleaner, CleanupError
from recovery_manager import RecoveryManager from .recovery_manager import RecoveryManager
from state_manager import QueueStateManager from .state_manager import QueueStateManager
from metrics_manager import QueueMetricsManager from .metrics_manager import QueueMetricsManager
from processor import QueueProcessor from .processor import QueueProcessor
from health_checker import HealthChecker from .health_checker import HealthChecker
# Importing from cleaners subdirectory # Importing from cleaners subdirectory
from cleaners import GuildCleaner, HistoryCleaner, TrackingCleaner from .cleaners import GuildCleaner, HistoryCleaner, TrackingCleaner
# Corrected relative imports from utils # Corrected relative imports from utils
from utils.compression_handler import CompressionHandler from ..utils.compression_handler import CompressionHandler
from utils.directory_manager import DirectoryManager from ..utils.directory_manager import DirectoryManager
from utils.download_manager import DownloadManager from ..utils.download_manager import DownloadManager
from utils.file_operations import FileOperations from ..utils.file_operations import FileOperations
from utils.progress_tracker import ProgressTracker from ..utils.progress_tracker import ProgressTracker
from processor.url_extractor import URLValidator from ..processor.url_extractor import URLValidator
__all__ = [ __all__ = [
# Queue models and types # Queue models and types

View File

@@ -7,15 +7,15 @@ from dataclasses import dataclass, field
from typing import Optional, Tuple, Dict, Any, List, Set, Callable from typing import Optional, Tuple, Dict, Any, List, Set, Callable
from datetime import datetime, timedelta from datetime import datetime, timedelta
from core.c_types import IQueueManager, QueueState, ComponentStatus from ..core.c_types import IQueueManager, QueueState, ComponentStatus
from state_manager import QueueStateManager from .state_manager import QueueStateManager
from processor import QueueProcessor from .processor import QueueProcessor
from metrics_manager import QueueMetricsManager from .metrics_manager import QueueMetricsManager
from persistence import QueuePersistenceManager, QueueError from .persistence import QueuePersistenceManager, QueueError
from monitoring import QueueMonitor, MonitoringLevel from .monitoring import QueueMonitor, MonitoringLevel
from cleanup import QueueCleaner, CleanupError from .cleanup import QueueCleaner, CleanupError
from models import QueueItem, QueueError from .models import QueueItem, QueueError
from q_types import ProcessingStrategy from .q_types import ProcessingStrategy
logger = logging.getLogger("QueueManager") logger = logging.getLogger("QueueManager")