fix import error and method order

This commit is contained in:
Chuck
2025-07-22 12:35:14 -05:00
parent 0f181905eb
commit e25e853de6
2 changed files with 23 additions and 23 deletions

View File

@@ -74,18 +74,18 @@
"use_short_date_format": true "use_short_date_format": true
}, },
"clock": { "clock": {
"enabled": true, "enabled": false,
"format": "%I:%M %p", "format": "%I:%M %p",
"update_interval": 1 "update_interval": 1
}, },
"weather": { "weather": {
"enabled": true, "enabled": false,
"update_interval": 1800, "update_interval": 1800,
"units": "imperial", "units": "imperial",
"display_format": "{temp}°F\n{condition}" "display_format": "{temp}°F\n{condition}"
}, },
"stocks": { "stocks": {
"enabled": true, "enabled": false,
"update_interval": 600, "update_interval": 600,
"symbols": [ "symbols": [
"ASTS", "SCHD", "INTC", "NVDA", "T", "VOO", "SMCI" "ASTS", "SCHD", "INTC", "NVDA", "T", "VOO", "SMCI"
@@ -93,7 +93,7 @@
"display_format": "{symbol}: ${price} ({change}%)" "display_format": "{symbol}: ${price} ({change}%)"
}, },
"crypto": { "crypto": {
"enabled": true, "enabled": false,
"update_interval": 600, "update_interval": 600,
"symbols": [ "symbols": [
"BTC-USD", "ETH-USD" "BTC-USD", "ETH-USD"
@@ -101,7 +101,7 @@
"display_format": "{symbol}: ${price} ({change}%)" "display_format": "{symbol}: ${price} ({change}%)"
}, },
"stock_news": { "stock_news": {
"enabled": true, "enabled": false,
"update_interval": 3600, "update_interval": 3600,
"scroll_speed": 1, "scroll_speed": 1,
"scroll_delay": 0.001, "scroll_delay": 0.001,
@@ -124,7 +124,7 @@
"show_channel_logos": true "show_channel_logos": true
}, },
"calendar": { "calendar": {
"enabled": true, "enabled": false,
"credentials_file": "credentials.json", "credentials_file": "credentials.json",
"token_file": "token.pickle", "token_file": "token.pickle",
"update_interval": 3600, "update_interval": 3600,

View File

@@ -484,23 +484,6 @@ class OddsTickerManager:
if away_logo: if away_logo:
away_logo = away_logo.resize((logo_size, logo_size), Image.Resampling.LANCZOS) away_logo = away_logo.resize((logo_size, logo_size), Image.Resampling.LANCZOS)
# Datetime column width
day_text = local_time.strftime("%A")
date_text = local_time.strftime("%-m/%d")
time_text = local_time.strftime("%I:%M%p").lstrip('0')
datetime_col_width = max(day_width, date_width, time_width)
if broadcast_logo:
# Resize broadcast logo to fit the datetime column width
ratio = datetime_col_width / broadcast_logo.width
new_height = int(broadcast_logo.height * ratio)
broadcast_logo = broadcast_logo.resize((datetime_col_width, new_height), Image.Resampling.LANCZOS)
# "vs." text
vs_text = "vs."
temp_draw = ImageDraw.Draw(Image.new('RGB', (1, 1)))
vs_width = int(temp_draw.textlength(vs_text, font=vs_font))
# Format date and time into 3 parts # Format date and time into 3 parts
game_time = game['start_time'] game_time = game['start_time']
timezone_str = self.config.get('timezone', 'UTC') timezone_str = self.config.get('timezone', 'UTC')
@@ -518,6 +501,23 @@ class OddsTickerManager:
date_text = local_time.strftime("%-m/%d") date_text = local_time.strftime("%-m/%d")
time_text = local_time.strftime("%I:%M%p").lstrip('0') time_text = local_time.strftime("%I:%M%p").lstrip('0')
# Datetime column width
temp_draw = ImageDraw.Draw(Image.new('RGB', (1, 1)))
day_width = int(temp_draw.textlength(day_text, font=datetime_font))
date_width = int(temp_draw.textlength(date_text, font=datetime_font))
time_width = int(temp_draw.textlength(time_text, font=datetime_font))
datetime_col_width = max(day_width, date_width, time_width)
if broadcast_logo:
# Resize broadcast logo to fit the datetime column width
ratio = datetime_col_width / broadcast_logo.width
new_height = int(broadcast_logo.height * ratio)
broadcast_logo = broadcast_logo.resize((datetime_col_width, new_height), Image.Resampling.LANCZOS)
# "vs." text
vs_text = "vs."
vs_width = int(temp_draw.textlength(vs_text, font=vs_font))
# Team and record text # Team and record text
away_team_text = f"{game.get('away_team_name', game.get('away_team', 'N/A'))} ({game.get('away_record', '') or 'N/A'})" away_team_text = f"{game.get('away_team_name', game.get('away_team', 'N/A'))} ({game.get('away_record', '') or 'N/A'})"
home_team_text = f"{game.get('home_team_name', game.get('home_team', 'N/A'))} ({game.get('home_record', '') or 'N/A'})" home_team_text = f"{game.get('home_team_name', game.get('home_team', 'N/A'))} ({game.get('home_record', '') or 'N/A'})"