Refactor calendar manager initialization to use display_manager directly instead of matrix and canvas

This commit is contained in:
ChuckBuilds
2025-04-22 11:19:51 -05:00
parent 4b2270c80f
commit 718eb27cbb
2 changed files with 3 additions and 8 deletions

View File

@@ -19,10 +19,9 @@ logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO) # Set to INFO to reduce noise logger.setLevel(logging.INFO) # Set to INFO to reduce noise
class CalendarManager: class CalendarManager:
def __init__(self, matrix, canvas, config): def __init__(self, display_manager, config):
logger.info("Initializing CalendarManager") logger.info("Initializing CalendarManager")
self.matrix = matrix self.display_manager = display_manager
self.canvas = canvas
self.config = config self.config = config
self.calendar_config = config.get('calendar', {}) self.calendar_config = config.get('calendar', {})
self.enabled = self.calendar_config.get('enabled', False) 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}") 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 # Get timezone from config
self.config_manager = ConfigManager() self.config_manager = ConfigManager()
timezone_str = self.config_manager.get_timezone() timezone_str = self.config_manager.get_timezone()

View File

@@ -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.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.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.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 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(f"Calendar Manager initialized: {'Object' if self.calendar else 'None'}")
logger.info("Display modes initialized in %.3f seconds", time.time() - init_time) logger.info("Display modes initialized in %.3f seconds", time.time() - init_time)