From 15c17612bce5ca40f80e2b46f0ef262b4e605872 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Mon, 18 Nov 2024 05:31:47 +0000
Subject: [PATCH] fix

---
 videoarchiver/core/__init__.py  | 44 ++++++++++++++++++++++++++-------
 videoarchiver/queue/__init__.py | 36 +++++++++++++--------------
 videoarchiver/queue/manager.py  | 18 +++++++-------
 3 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/videoarchiver/core/__init__.py b/videoarchiver/core/__init__.py
index b9556f5..dae03c1 100644
--- a/videoarchiver/core/__init__.py
+++ b/videoarchiver/core/__init__.py
@@ -1,11 +1,37 @@
-"""Core module for VideoArchiver cog"""
+"""Core module for VideoArchiver"""
 
-# try:
-# Try relative imports first
-from base import VideoArchiver
+from .base import VideoArchiver
+from .commands import (
+    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:
-# Fall back to absolute imports if relative imports fail
-# from videoarchiver.core.base import VideoArchiver
-
-__all__ = ["VideoArchiver"]
+__all__ = [
+    "VideoArchiver",
+    "ArchiverCommands",
+    "DatabaseCommands",
+    "SettingsCommands",
+    "ComponentManager",
+    "ErrorHandler",
+    "EventHandler",
+    "initialize_cog",
+    "LifecycleManager",
+    "ResponseHandler",
+    "Settings",
+    "IQueueManager",
+    "QueueState",
+    "ComponentStatus"
+]
diff --git a/videoarchiver/queue/__init__.py b/videoarchiver/queue/__init__.py
index 95d6f58..6c7ca7f 100644
--- a/videoarchiver/queue/__init__.py
+++ b/videoarchiver/queue/__init__.py
@@ -1,27 +1,27 @@
 """Queue management package for video processing"""
 
-from models import QueueItem, QueueMetrics
-from q_types import QueuePriority, ProcessingMetrics
-from manager import EnhancedVideoQueueManager
-from persistence import QueuePersistenceManager, QueueError
-from monitoring import QueueMonitor, MonitoringError
-from cleanup import QueueCleaner, CleanupError
-from recovery_manager import RecoveryManager
-from state_manager import QueueStateManager
-from metrics_manager import QueueMetricsManager
-from processor import QueueProcessor
-from health_checker import HealthChecker
+from .models import QueueItem, QueueMetrics
+from .q_types import QueuePriority, ProcessingMetrics
+from .manager import EnhancedVideoQueueManager
+from .persistence import QueuePersistenceManager, QueueError
+from .monitoring import QueueMonitor, MonitoringError
+from .cleanup import QueueCleaner, CleanupError
+from .recovery_manager import RecoveryManager
+from .state_manager import QueueStateManager
+from .metrics_manager import QueueMetricsManager
+from .processor import QueueProcessor
+from .health_checker import HealthChecker
 
 # Importing from cleaners subdirectory
-from cleaners import GuildCleaner, HistoryCleaner, TrackingCleaner
+from .cleaners import GuildCleaner, HistoryCleaner, TrackingCleaner
 
 # Corrected relative imports from utils
-from utils.compression_handler import CompressionHandler
-from utils.directory_manager import DirectoryManager
-from utils.download_manager import DownloadManager
-from utils.file_operations import FileOperations
-from utils.progress_tracker import ProgressTracker
-from processor.url_extractor import URLValidator
+from ..utils.compression_handler import CompressionHandler
+from ..utils.directory_manager import DirectoryManager
+from ..utils.download_manager import DownloadManager
+from ..utils.file_operations import FileOperations
+from ..utils.progress_tracker import ProgressTracker
+from ..processor.url_extractor import URLValidator
 
 __all__ = [
     # Queue models and types
diff --git a/videoarchiver/queue/manager.py b/videoarchiver/queue/manager.py
index 24e44be..22dfdf4 100644
--- a/videoarchiver/queue/manager.py
+++ b/videoarchiver/queue/manager.py
@@ -7,15 +7,15 @@ from dataclasses import dataclass, field
 from typing import Optional, Tuple, Dict, Any, List, Set, Callable
 from datetime import datetime, timedelta
 
-from core.c_types import IQueueManager, QueueState, ComponentStatus
-from state_manager import QueueStateManager
-from processor import QueueProcessor
-from metrics_manager import QueueMetricsManager
-from persistence import QueuePersistenceManager, QueueError
-from monitoring import QueueMonitor, MonitoringLevel
-from cleanup import QueueCleaner, CleanupError
-from models import QueueItem, QueueError
-from q_types import ProcessingStrategy
+from ..core.c_types import IQueueManager, QueueState, ComponentStatus
+from .state_manager import QueueStateManager
+from .processor import QueueProcessor
+from .metrics_manager import QueueMetricsManager
+from .persistence import QueuePersistenceManager, QueueError
+from .monitoring import QueueMonitor, MonitoringLevel
+from .cleanup import QueueCleaner, CleanupError
+from .models import QueueItem, QueueError
+from .q_types import ProcessingStrategy
 
 logger = logging.getLogger("QueueManager")