From 718eb27cbb7765d07bf1f7a6537d8fe80707a6a9 Mon Sep 17 00:00:00 2001
From: ChuckBuilds <33324927+ChuckBuilds@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:19:51 -0500
Subject: [PATCH] Refactor calendar manager initialization to use
 display_manager directly instead of matrix and canvas

---
 src/calendar_manager.py   | 9 ++-------
 src/display_controller.py | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/calendar_manager.py b/src/calendar_manager.py
index 102496c0..7c3803fa 100644
--- a/src/calendar_manager.py
+++ b/src/calendar_manager.py
@@ -19,10 +19,9 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)  # Set to INFO to reduce noise
 
 class CalendarManager:
-    def __init__(self, matrix, canvas, config):
+    def __init__(self, display_manager, config):
         logger.info("Initializing CalendarManager")
-        self.matrix = matrix
-        self.canvas = canvas
+        self.display_manager = display_manager
         self.config = config
         self.calendar_config = config.get('calendar', {})
         self.enabled = self.calendar_config.get('enabled', False)
@@ -36,10 +35,6 @@ class CalendarManager:
         
         logger.info(f"Calendar configuration: enabled={self.enabled}, update_interval={self.update_interval}, max_events={self.max_events}, calendars={self.calendars}")
         
-        # Get display manager instance
-        from src.display_manager import DisplayManager
-        self.display_manager = DisplayManager._instance
-        
         # Get timezone from config
         self.config_manager = ConfigManager()
         timezone_str = self.config_manager.get_timezone()
diff --git a/src/display_controller.py b/src/display_controller.py
index c7aa0ed0..83f20ca2 100644
--- a/src/display_controller.py
+++ b/src/display_controller.py
@@ -34,7 +34,7 @@ class DisplayController:
         self.weather = WeatherManager(self.config, self.display_manager) if self.config.get('weather', {}).get('enabled', False) else None
         self.stocks = StockManager(self.config, self.display_manager) if self.config.get('stocks', {}).get('enabled', False) else None
         self.news = StockNewsManager(self.config, self.display_manager) if self.config.get('stock_news', {}).get('enabled', False) else None
-        self.calendar = CalendarManager(self.display_manager.matrix, self.display_manager.current_canvas, self.config) if self.config.get('calendar', {}).get('enabled', False) else None
+        self.calendar = CalendarManager(self.display_manager, self.config) if self.config.get('calendar', {}).get('enabled', False) else None
         self.youtube = YouTubeDisplay(self.display_manager, self.config_manager.config_path, self.config_manager.secrets_path) if self.config.get('youtube', {}).get('enabled', False) else None
         logger.info(f"Calendar Manager initialized: {'Object' if self.calendar else 'None'}")
         logger.info("Display modes initialized in %.3f seconds", time.time() - init_time)