diff --git a/.gitignore b/.gitignore index 66ed5cd4..e0f4afc8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ __pycache__/ # Secrets config/config_secrets.json +config/config.json +config/config.json.backup credentials.json token.pickle diff --git a/LEDMatrix.wiki b/LEDMatrix.wiki index 8d2c1439..d85658a2 160000 --- a/LEDMatrix.wiki +++ b/LEDMatrix.wiki @@ -1 +1 @@ -Subproject commit 8d2c143954db2589d9241b73ce2aaef17aa2ddab +Subproject commit d85658a2eb3ad385d97fdf3fcbf300d3fedea7cb diff --git a/README.md b/README.md index f4379b88..f42a45cc 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ The system supports live, recent, and upcoming game information for multiple spo - NCAA Football - NCAA Men's Basketball - NCAA Men's Baseball -- Soccer +- Soccer (Premier League, La Liga, Bundesliga, Serie A, Ligue 1, Liga Portugal, Champions League, Europa League, MLS) - (Note, some of these sports seasons were not active during development and might need fine tuning when games are active) @@ -260,16 +260,38 @@ sudo reboot ## Configuration -1.Edit `config/config.json` with your preferences via `sudo nano config/config.json` +### Initial Setup -###API Keys +The system uses a template-based configuration approach to avoid Git conflicts during updates: + +1. **First-time setup**: Copy the template to create your config: + ```bash + cp config/config.template.json config/config.json + ``` + +2. **Edit your configuration**: + ```bash + sudo nano config/config.json + ``` +or edit via web interface at http://ledpi:5001 + + +### API Keys and Secrets For sensitive settings like API keys: -Copy the template: `cp config/config_secrets.template.json config/config_secrets.json` -Edit `config/config_secrets.json` with your API keys via `sudo nano config/config_secrets.json` -Ctrl + X to exit, Y to overwrite, Enter to Confirm +1. Copy the secrets template: `cp config/config_secrets.template.json config/config_secrets.json` +2. Edit `config/config_secrets.json` with your API keys via `sudo nano config/config_secrets.json` +3. Ctrl + X to exit, Y to overwrite, Enter to Confirm -Everything is configured via `config/config.json` and `config/config_secrets.json`. +### Automatic Configuration Migration + +The system automatically handles configuration updates: +- **New installations**: Creates `config.json` from the template automatically +- **Existing installations**: Automatically adds new configuration options with default values when the system starts +- **Backup protection**: Creates a backup of your current config before applying updates +- **No conflicts**: Your custom settings are preserved while new options are added + +Everything is configured via `config/config.json` and `config/config_secrets.json`. The `config.json` file is not tracked by Git to prevent conflicts during updates. diff --git a/assets/sports/all_team_abbreviations.txt b/assets/sports/all_team_abbreviations.txt index 4397af35..e2ae5c27 100644 --- a/assets/sports/all_team_abbreviations.txt +++ b/assets/sports/all_team_abbreviations.txt @@ -755,6 +755,20 @@ MLB Conferences/Divisions OAK => Oakland Athletics SEA => Seattle Mariners TEX => Texas Rangers + +Soccer Leagues: + LEAGUE_SLUGS = { + "eng.1": "Premier League", + "esp.1": "La Liga", + "ger.1": "Bundesliga", + "ita.1": "Serie A", + "fra.1": "Ligue 1", + "uefa.champions": "Champions League", + "uefa.europa": "Europa League", + "usa.1": "MLS", + "por.1": "Liga Portugal", # Add this line + } + Soccer - Premier League (England) ARS => Arsenal AVL => Aston Villa @@ -886,6 +900,24 @@ Soccer - Champions League VFB => VfB Stuttgart VIL => Villarreal +Soccer - Liga Portugal (Portugal) + ARO => Arouca + BEN => SL Benfica + BRA => SC Braga + CHA => Chaves + EST => Estoril Praia + FAM => Famalicão + GIL => Gil Vicente + MOR => Moreirense + POR => FC Porto + PTM => Portimonense + RIO => Rio Ave + SR => Sporting CP + VGU => Vitória de Guimarães + VSC => Vitória de Setúbal + + + Soccer - Other Teams austin => Austin FC cf_montral => CF Montréal diff --git a/assets/sports/mlb_logos/mlb.png b/assets/sports/mlb_logos/mlb.png index 9c95d756..7196811c 100644 Binary files a/assets/sports/mlb_logos/mlb.png and b/assets/sports/mlb_logos/mlb.png differ diff --git a/assets/sports/nba_logos/nba.png b/assets/sports/nba_logos/nba.png index 7e8ddf8f..6738f818 100644 Binary files a/assets/sports/nba_logos/nba.png and b/assets/sports/nba_logos/nba.png differ diff --git a/assets/sports/nfl_logos/nfl.png b/assets/sports/nfl_logos/nfl.png index 58f0b23f..49f71d91 100644 Binary files a/assets/sports/nfl_logos/nfl.png and b/assets/sports/nfl_logos/nfl.png differ diff --git a/assets/sports/nhl_logos/nhl.png b/assets/sports/nhl_logos/nhl.png index f36fe3f4..eaebd594 100644 Binary files a/assets/sports/nhl_logos/nhl.png and b/assets/sports/nhl_logos/nhl.png differ diff --git a/assets/sports/soccer_logos/AJX.png b/assets/sports/soccer_logos/AJX.png new file mode 100644 index 00000000..d0982e82 Binary files /dev/null and b/assets/sports/soccer_logos/AJX.png differ diff --git a/assets/sports/soccer_logos/ARO.png b/assets/sports/soccer_logos/ARO.png new file mode 100644 index 00000000..dfb41fb2 Binary files /dev/null and b/assets/sports/soccer_logos/ARO.png differ diff --git a/assets/sports/soccer_logos/AUS.png b/assets/sports/soccer_logos/AUS.png new file mode 100644 index 00000000..fe5910a9 Binary files /dev/null and b/assets/sports/soccer_logos/AUS.png differ diff --git a/assets/sports/soccer_logos/BAY.png b/assets/sports/soccer_logos/BAY.png new file mode 100644 index 00000000..ac3805e7 Binary files /dev/null and b/assets/sports/soccer_logos/BAY.png differ diff --git a/assets/sports/soccer_logos/BEN.png b/assets/sports/soccer_logos/BEN.png new file mode 100644 index 00000000..f725c1ce Binary files /dev/null and b/assets/sports/soccer_logos/BEN.png differ diff --git a/assets/sports/soccer_logos/BRA.png b/assets/sports/soccer_logos/BRA.png new file mode 100644 index 00000000..1dd00bb9 Binary files /dev/null and b/assets/sports/soccer_logos/BRA.png differ diff --git a/assets/sports/soccer_logos/BUR.png b/assets/sports/soccer_logos/BUR.png new file mode 100644 index 00000000..c6a30821 Binary files /dev/null and b/assets/sports/soccer_logos/BUR.png differ diff --git a/assets/sports/soccer_logos/CHA.png b/assets/sports/soccer_logos/CHA.png new file mode 100644 index 00000000..3688da6f Binary files /dev/null and b/assets/sports/soccer_logos/CHA.png differ diff --git a/assets/sports/soccer_logos/DOR.png b/assets/sports/soccer_logos/DOR.png new file mode 100644 index 00000000..f5333df3 Binary files /dev/null and b/assets/sports/soccer_logos/DOR.png differ diff --git a/assets/sports/soccer_logos/EST.png b/assets/sports/soccer_logos/EST.png new file mode 100644 index 00000000..73266852 Binary files /dev/null and b/assets/sports/soccer_logos/EST.png differ diff --git a/assets/sports/soccer_logos/FAM.png b/assets/sports/soccer_logos/FAM.png new file mode 100644 index 00000000..9473610d Binary files /dev/null and b/assets/sports/soccer_logos/FAM.png differ diff --git a/assets/sports/soccer_logos/GIL.png b/assets/sports/soccer_logos/GIL.png new file mode 100644 index 00000000..3a51f4b7 Binary files /dev/null and b/assets/sports/soccer_logos/GIL.png differ diff --git a/assets/sports/soccer_logos/KOL.png b/assets/sports/soccer_logos/KOL.png new file mode 100644 index 00000000..29b7c001 Binary files /dev/null and b/assets/sports/soccer_logos/KOL.png differ diff --git a/assets/sports/soccer_logos/LEV.png b/assets/sports/soccer_logos/LEV.png new file mode 100644 index 00000000..082a37c2 Binary files /dev/null and b/assets/sports/soccer_logos/LEV.png differ diff --git a/assets/sports/soccer_logos/LUT.png b/assets/sports/soccer_logos/LUT.png new file mode 100644 index 00000000..6a7c088a Binary files /dev/null and b/assets/sports/soccer_logos/LUT.png differ diff --git a/assets/sports/soccer_logos/LYON.png b/assets/sports/soccer_logos/LYON.png new file mode 100644 index 00000000..7d76c4fa Binary files /dev/null and b/assets/sports/soccer_logos/LYON.png differ diff --git a/assets/sports/soccer_logos/MAR.png b/assets/sports/soccer_logos/MAR.png new file mode 100644 index 00000000..e5341a62 Binary files /dev/null and b/assets/sports/soccer_logos/MAR.png differ diff --git a/assets/sports/soccer_logos/MOR.png b/assets/sports/soccer_logos/MOR.png new file mode 100644 index 00000000..e4d4e605 Binary files /dev/null and b/assets/sports/soccer_logos/MOR.png differ diff --git a/assets/sports/soccer_logos/MTL.png b/assets/sports/soccer_logos/MTL.png new file mode 100644 index 00000000..82be626c Binary files /dev/null and b/assets/sports/soccer_logos/MTL.png differ diff --git a/assets/sports/soccer_logos/NICE.png b/assets/sports/soccer_logos/NICE.png new file mode 100644 index 00000000..6fc6ab98 Binary files /dev/null and b/assets/sports/soccer_logos/NICE.png differ diff --git a/assets/sports/soccer_logos/NSC.png b/assets/sports/soccer_logos/NSC.png new file mode 100644 index 00000000..39615fc2 Binary files /dev/null and b/assets/sports/soccer_logos/NSC.png differ diff --git a/assets/sports/soccer_logos/NYC.png b/assets/sports/soccer_logos/NYC.png new file mode 100644 index 00000000..b950e986 Binary files /dev/null and b/assets/sports/soccer_logos/NYC.png differ diff --git a/assets/sports/soccer_logos/NYR.png b/assets/sports/soccer_logos/NYR.png new file mode 100644 index 00000000..0e54f376 Binary files /dev/null and b/assets/sports/soccer_logos/NYR.png differ diff --git a/assets/sports/soccer_logos/PSG.png b/assets/sports/soccer_logos/PSG.png new file mode 100644 index 00000000..115a38b3 Binary files /dev/null and b/assets/sports/soccer_logos/PSG.png differ diff --git a/assets/sports/soccer_logos/PTM.png b/assets/sports/soccer_logos/PTM.png new file mode 100644 index 00000000..590adaab Binary files /dev/null and b/assets/sports/soccer_logos/PTM.png differ diff --git a/assets/sports/soccer_logos/RIO.png b/assets/sports/soccer_logos/RIO.png new file mode 100644 index 00000000..42ef4019 Binary files /dev/null and b/assets/sports/soccer_logos/RIO.png differ diff --git a/assets/sports/soccer_logos/SCP.png b/assets/sports/soccer_logos/SCP.png new file mode 100644 index 00000000..bfbb3bce Binary files /dev/null and b/assets/sports/soccer_logos/SCP.png differ diff --git a/assets/sports/soccer_logos/SHU.png b/assets/sports/soccer_logos/SHU.png new file mode 100644 index 00000000..591ae33c Binary files /dev/null and b/assets/sports/soccer_logos/SHU.png differ diff --git a/assets/sports/soccer_logos/STU.png b/assets/sports/soccer_logos/STU.png new file mode 100644 index 00000000..0ac971a3 Binary files /dev/null and b/assets/sports/soccer_logos/STU.png differ diff --git a/assets/sports/soccer_logos/VGU.png b/assets/sports/soccer_logos/VGU.png new file mode 100644 index 00000000..522dcc19 Binary files /dev/null and b/assets/sports/soccer_logos/VGU.png differ diff --git a/assets/sports/soccer_logos/VSC.png b/assets/sports/soccer_logos/VSC.png new file mode 100644 index 00000000..0f462b40 Binary files /dev/null and b/assets/sports/soccer_logos/VSC.png differ diff --git a/config/config.json b/config/config.template.json similarity index 98% rename from config/config.json rename to config/config.template.json index 8908808f..f2cb4e0d 100644 --- a/config/config.json +++ b/config/config.template.json @@ -5,10 +5,10 @@ "start_time": "07:00", "end_time": "23:00" }, - "timezone": "America/New_York", + "timezone": "America/Chicago", "location": { - "city": "Tampa", - "state": "Florida", + "city": "Dallas", + "state": "Texas", "country": "US" }, "display": { @@ -82,10 +82,10 @@ "update_interval": 1 }, "weather": { - "enabled": true, + "enabled": false, "update_interval": 1800, "units": "imperial", - "display_format": "{temp}\u00b0F\n{condition}" + "display_format": "{temp}°F\n{condition}" }, "stocks": { "enabled": false, @@ -130,12 +130,11 @@ "duration_buffer": 0.1 }, "odds_ticker": { - "enabled": false, + "enabled": true, "show_favorite_teams_only": true, "games_per_favorite_team": 1, "max_games_per_league": 5, "show_odds_only": false, - "fetch_odds": true, "sort_order": "soonest", "enabled_leagues": [ "nfl", @@ -152,7 +151,7 @@ "dynamic_duration": true, "min_duration": 30, "max_duration": 300, - "duration_buffer": 0.05 + "duration_buffer": 0.1 }, "leaderboard": { "enabled": false, @@ -269,6 +268,8 @@ "live_update_interval": 30, "live_odds_update_interval": 3600, "odds_update_interval": 3600, + "recent_update_interval": 3600, + "upcoming_update_interval": 3600, "recent_games_to_show": 1, "upcoming_games_to_show": 1, "show_favorite_teams_only": true, @@ -304,10 +305,9 @@ ], "logo_dir": "assets/sports/ncaa_logos", "show_records": true, - "show_ranking": true, "display_modes": { "ncaa_fb_live": true, - "ncaa_fb_recent": true , + "ncaa_fb_recent": true, "ncaa_fb_upcoming": true } }, @@ -440,7 +440,7 @@ } }, "text_display": { - "enabled": true, + "enabled": false, "text": "Subscribe to ChuckBuilds", "font_path": "assets/fonts/press-start-2p.ttf", "font_size": 8, diff --git a/first_time_install.sh b/first_time_install.sh index e486bbfa..3bea92c6 100644 --- a/first_time_install.sh +++ b/first_time_install.sh @@ -150,17 +150,18 @@ echo "" echo "This script will perform the following steps:" echo "1. Install system dependencies" echo "2. Fix cache permissions" -echo "3. Install main LED Matrix service" -echo "4. Install Python project dependencies (requirements.txt)" -echo "5. Build and install rpi-rgb-led-matrix and test import" -echo "6. Install web interface dependencies" -echo "7. Install web interface service" -echo "8. Configure web interface permissions" -echo "9. Configure passwordless sudo access" -echo "10. Set up proper file ownership" -echo "11. Configure sound module to avoid conflicts" -echo "12. Apply performance optimizations" -echo "13. Test the installation" +echo "3. Fix assets directory permissions" +echo "4. Install main LED Matrix service" +echo "5. Install Python project dependencies (requirements.txt)" +echo "6. Build and install rpi-rgb-led-matrix and test import" +echo "7. Install web interface dependencies" +echo "8. Install web interface service" +echo "9. Configure web interface permissions" +echo "10. Configure passwordless sudo access" +echo "11. Set up proper file ownership" +echo "12. Configure sound module to avoid conflicts" +echo "13. Apply performance optimizations" +echo "14. Test the installation" echo "" # Ask for confirmation @@ -217,8 +218,57 @@ else fi echo "" +CURRENT_STEP="Fix assets directory permissions" +echo "Step 3: Fixing assets directory permissions..." +echo "--------------------------------------------" + +# Run the assets permissions fix +if [ -f "$PROJECT_ROOT_DIR/fix_assets_permissions.sh" ]; then + echo "Running assets permissions fix..." + bash "$PROJECT_ROOT_DIR/fix_assets_permissions.sh" + echo "✓ Assets permissions fixed" +else + echo "⚠ Assets permissions script not found, fixing permissions manually..." + + # Set ownership of the entire assets directory to the real user + echo "Setting ownership of assets directory..." + chown -R "$ACTUAL_USER:$ACTUAL_USER" "$PROJECT_ROOT_DIR/assets" + + # Set permissions to allow read/write for owner and group, read for others + echo "Setting permissions for assets directory..." + chmod -R 775 "$PROJECT_ROOT_DIR/assets" + + # Specifically ensure the sports logos directories are writable + SPORTS_DIRS=( + "sports/ncaa_fbs_logos" + "sports/nfl_logos" + "sports/nba_logos" + "sports/nhl_logos" + "sports/mlb_logos" + "sports/milb_logos" + "sports/soccer_logos" + ) + + echo "Ensuring sports logo directories are writable..." + for SPORTS_DIR in "${SPORTS_DIRS[@]}"; do + FULL_PATH="$PROJECT_ROOT_DIR/assets/$SPORTS_DIR" + if [ -d "$FULL_PATH" ]; then + chmod 775 "$FULL_PATH" + chown "$ACTUAL_USER:$ACTUAL_USER" "$FULL_PATH" + else + echo "Creating directory: $FULL_PATH" + mkdir -p "$FULL_PATH" + chown "$ACTUAL_USER:$ACTUAL_USER" "$FULL_PATH" + chmod 775 "$FULL_PATH" + fi + done + + echo "✓ Assets permissions fixed manually" +fi +echo "" + CURRENT_STEP="Install main LED Matrix service" -echo "Step 3: Installing main LED Matrix service..." +echo "Step 4: Installing main LED Matrix service..." echo "---------------------------------------------" # Run the main service installation (idempotent) @@ -233,14 +283,52 @@ else fi echo "" -CURRENT_STEP="Ensure secrets configuration exists" -echo "Step 3.1: Ensuring secrets configuration exists..." -echo "-----------------------------------------------" +CURRENT_STEP="Ensure configuration files exist" +echo "Step 4.1: Ensuring configuration files exist..." +echo "------------------------------------------------" # Ensure config directory exists mkdir -p "$PROJECT_ROOT_DIR/config" chmod 755 "$PROJECT_ROOT_DIR/config" || true +# Create config.json from template if missing +if [ ! -f "$PROJECT_ROOT_DIR/config/config.json" ]; then + if [ -f "$PROJECT_ROOT_DIR/config/config.template.json" ]; then + echo "Creating config/config.json from template..." + cp "$PROJECT_ROOT_DIR/config/config.template.json" "$PROJECT_ROOT_DIR/config/config.json" + chown "$ACTUAL_USER:$ACTUAL_USER" "$PROJECT_ROOT_DIR/config/config.json" || true + chmod 644 "$PROJECT_ROOT_DIR/config/config.json" + echo "✓ Main config file created from template" + else + echo "⚠ Template config/config.template.json not found; creating a minimal config file" + cat > "$PROJECT_ROOT_DIR/config/config.json" <<'EOF' +{ + "web_display_autostart": true, + "timezone": "America/Chicago", + "display": { + "hardware": { + "rows": 32, + "cols": 64, + "chain_length": 2, + "parallel": 1, + "brightness": 95, + "hardware_mapping": "adafruit-hat-pwm" + } + }, + "clock": { + "enabled": true, + "format": "%I:%M %p" + } +} +EOF + chown "$ACTUAL_USER:$ACTUAL_USER" "$PROJECT_ROOT_DIR/config/config.json" || true + chmod 644 "$PROJECT_ROOT_DIR/config/config.json" + echo "✓ Minimal config file created" + fi +else + echo "✓ Main config file already exists" +fi + # Create config_secrets.json from template if missing if [ ! -f "$PROJECT_ROOT_DIR/config/config_secrets.json" ]; then if [ -f "$PROJECT_ROOT_DIR/config/config_secrets.template.json" ]; then @@ -263,12 +351,12 @@ EOF echo "✓ Minimal secrets file created" fi else - echo "Secrets file already exists; leaving as-is" + echo "✓ Secrets file already exists" fi echo "" CURRENT_STEP="Install project Python dependencies" -echo "Step 4: Installing Python project dependencies..." +echo "Step 5: Installing Python project dependencies..." echo "-----------------------------------------------" # Install main project Python dependencies @@ -283,7 +371,7 @@ echo "✓ Project Python dependencies installed" echo "" CURRENT_STEP="Build and install rpi-rgb-led-matrix" -echo "Step 5: Building and installing rpi-rgb-led-matrix..." +echo "Step 6: Building and installing rpi-rgb-led-matrix..." echo "-----------------------------------------------------" # If already installed and not forcing rebuild, skip expensive build @@ -327,7 +415,7 @@ fi echo "" CURRENT_STEP="Install web interface dependencies" -echo "Step 6: Installing web interface dependencies..." +echo "Step 7: Installing web interface dependencies..." echo "------------------------------------------------" # Install web interface dependencies @@ -335,9 +423,9 @@ echo "Installing Python dependencies for web interface..." cd "$PROJECT_ROOT_DIR" # Try to install dependencies using the smart installer if available -if [ -f "$PROJECT_ROOT_DIR/install_dependencies_apt.py" ]; then +if [ -f "$PROJECT_ROOT_DIR/scripts/install_dependencies_apt.py" ]; then echo "Using smart dependency installer..." - python3 "$PROJECT_ROOT_DIR/install_dependencies_apt.py" + python3 "$PROJECT_ROOT_DIR/scripts/install_dependencies_apt.py" else echo "Using pip to install dependencies..." if [ -f "$PROJECT_ROOT_DIR/requirements_web_v2.txt" ]; then @@ -351,7 +439,7 @@ echo "✓ Web interface dependencies installed" echo "" CURRENT_STEP="Install web interface service" -echo "Step 7: Installing web interface service..." +echo "Step 8: Installing web interface service..." echo "-------------------------------------------" if [ -f "$PROJECT_ROOT_DIR/install_web_service.sh" ]; then @@ -369,7 +457,7 @@ fi echo "" CURRENT_STEP="Harden systemd unit file permissions" -echo "Step 7.1: Setting systemd unit file permissions..." +echo "Step 8.1: Setting systemd unit file permissions..." echo "-----------------------------------------------" for unit in "/etc/systemd/system/ledmatrix.service" "/etc/systemd/system/ledmatrix-web.service"; do if [ -f "$unit" ]; then @@ -382,7 +470,7 @@ echo "✓ Systemd unit file permissions set" echo "" CURRENT_STEP="Configure web interface permissions" -echo "Step 8: Configuring web interface permissions..." +echo "Step 9: Configuring web interface permissions..." echo "------------------------------------------------" # Add user to required groups (idempotent) @@ -404,7 +492,7 @@ echo "✓ User added to required groups" echo "" CURRENT_STEP="Configure passwordless sudo access" -echo "Step 9: Configuring passwordless sudo access..." +echo "Step 10: Configuring passwordless sudo access..." echo "------------------------------------------------" # Create sudoers configuration for the web interface @@ -451,7 +539,7 @@ echo "✓ Passwordless sudo access configured" echo "" CURRENT_STEP="Set proper file ownership" -echo "Step 10: Setting proper file ownership..." +echo "Step 11: Setting proper file ownership..." echo "----------------------------------------" # Set ownership of project files to the user @@ -471,11 +559,18 @@ if [ -f "$PROJECT_ROOT_DIR/config/config_secrets.json" ]; then echo "✓ Secrets file permissions set" fi +# Set proper permissions for YTM auth file (readable by all users including root service) +if [ -f "$PROJECT_ROOT_DIR/config/ytm_auth.json" ]; then + chown "$ACTUAL_USER:$ACTUAL_USER" "$PROJECT_ROOT_DIR/config/ytm_auth.json" || true + chmod 644 "$PROJECT_ROOT_DIR/config/ytm_auth.json" + echo "✓ YTM auth file permissions set" +fi + echo "✓ File ownership configured" echo "" CURRENT_STEP="Normalize project file permissions" -echo "Step 10.1: Normalizing project file and directory permissions..." +echo "Step 11.1: Normalizing project file and directory permissions..." echo "--------------------------------------------------------------" # Normalize directory permissions (exclude VCS metadata) @@ -489,14 +584,14 @@ find "$PROJECT_ROOT_DIR" -path "*/.git*" -prune -o -type f -name "*.sh" -exec ch # Explicitly ensure common helper scripts are executable (in case paths change) chmod 755 "$PROJECT_ROOT_DIR/start_display.sh" "$PROJECT_ROOT_DIR/stop_display.sh" 2>/dev/null || true -chmod 755 "$PROJECT_ROOT_DIR/fix_cache_permissions.sh" "$PROJECT_ROOT_DIR/fix_web_permissions.sh" 2>/dev/null || true +chmod 755 "$PROJECT_ROOT_DIR/fix_cache_permissions.sh" "$PROJECT_ROOT_DIR/fix_web_permissions.sh" "$PROJECT_ROOT_DIR/fix_assets_permissions.sh" 2>/dev/null || true chmod 755 "$PROJECT_ROOT_DIR/install_service.sh" "$PROJECT_ROOT_DIR/install_web_service.sh" 2>/dev/null || true echo "✓ Project file permissions normalized" echo "" CURRENT_STEP="Sound module configuration" -echo "Step 11: Sound module configuration..." +echo "Step 12: Sound module configuration..." echo "-------------------------------------" # Remove services that may interfere with LED matrix timing @@ -539,7 +634,7 @@ echo "✓ Sound module configuration applied" echo "" CURRENT_STEP="Apply performance optimizations" -echo "Step 12: Applying performance optimizations..." +echo "Step 13: Applying performance optimizations..." echo "---------------------------------------------" # Prefer /boot/firmware on newer Raspberry Pi OS, fall back to /boot on older @@ -588,7 +683,7 @@ echo "✓ Performance optimizations applied" echo "" CURRENT_STEP="Test the installation" -echo "Step 13: Testing the installation..." +echo "Step 14: Testing the installation..." echo "----------------------------------" # Test sudo access @@ -665,7 +760,8 @@ echo "Enable/disable web interface autostart:" echo " Edit config/config.json and set 'web_display_autostart': true" echo "" echo "Configuration files:" -echo " Main config: config/config.json" -echo " Secrets: config/config_secrets.json (create from template if needed)" +echo " Main config: config/config.json (created from template automatically)" +echo " Secrets: config/config_secrets.json (created from template automatically)" +echo " Template: config/config.template.json (reference for new options)" echo "" echo "Enjoy your LED Matrix display!" diff --git a/fix_assets_permissions.sh b/fix_assets_permissions.sh new file mode 100644 index 00000000..ea3c40c1 --- /dev/null +++ b/fix_assets_permissions.sh @@ -0,0 +1,127 @@ +#!/bin/bash + +# LEDMatrix Assets Permissions Fix Script +# This script fixes permissions on the assets directory so the application can download and save team logos + +echo "Fixing LEDMatrix assets directory permissions..." + +# Get the real user (not root when running with sudo) +REAL_USER=${SUDO_USER:-$USER} +# Resolve the home directory of the real user robustly +if command -v getent >/dev/null 2>&1; then + REAL_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6) +else + REAL_HOME=$(eval echo ~"$REAL_USER") +fi +REAL_GROUP=$(id -gn "$REAL_USER") + +# Get the project directory +PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +ASSETS_DIR="$PROJECT_DIR/assets" + +echo "Project directory: $PROJECT_DIR" +echo "Assets directory: $ASSETS_DIR" +echo "Real user: $REAL_USER" +echo "Real group: $REAL_GROUP" + +# Check if assets directory exists +if [ ! -d "$ASSETS_DIR" ]; then + echo "Error: Assets directory does not exist at $ASSETS_DIR" + exit 1 +fi + +echo "" +echo "Fixing permissions for assets directory and subdirectories..." + +# Set ownership of the entire assets directory to the real user +echo "Setting ownership of assets directory..." +if sudo chown -R "$REAL_USER:$REAL_GROUP" "$ASSETS_DIR"; then + echo "✓ Set assets directory ownership to $REAL_USER:$REAL_GROUP" +else + echo "✗ Failed to set assets directory ownership" + exit 1 +fi + +# Set permissions to allow read/write for owner and group, read for others +echo "Setting permissions for assets directory..." +if sudo chmod -R 775 "$ASSETS_DIR"; then + echo "✓ Set assets directory permissions to 775" +else + echo "✗ Failed to set assets directory permissions" + exit 1 +fi + +# Specifically ensure the sports logos directories are writable +SPORTS_DIRS=( + "sports/ncaa_fbs_logos" + "sports/nfl_logos" + "sports/nba_logos" + "sports/nhl_logos" + "sports/mlb_logos" + "sports/milb_logos" + "sports/soccer_logos" +) + +echo "" +echo "Ensuring sports logo directories are writable..." + +for SPORTS_DIR in "${SPORTS_DIRS[@]}"; do + FULL_PATH="$ASSETS_DIR/$SPORTS_DIR" + echo "" + echo "Checking directory: $FULL_PATH" + + if [ -d "$FULL_PATH" ]; then + echo " - Directory exists" + echo " - Current permissions:" + ls -ld "$FULL_PATH" + + # Ensure the directory is writable + sudo chmod 775 "$FULL_PATH" + sudo chown "$REAL_USER:$REAL_GROUP" "$FULL_PATH" + + echo " - Updated permissions:" + ls -ld "$FULL_PATH" + + # Test write access + echo " - Testing write access as $REAL_USER..." + if sudo -u "$REAL_USER" test -w "$FULL_PATH"; then + echo " ✓ $FULL_PATH is writable by $REAL_USER" + else + echo " ✗ $FULL_PATH is not writable by $REAL_USER" + fi + else + echo " - Directory does not exist, creating it..." + sudo mkdir -p "$FULL_PATH" + sudo chown "$REAL_USER:$REAL_GROUP" "$FULL_PATH" + sudo chmod 775 "$FULL_PATH" + echo " - Created directory with proper permissions" + fi +done + +echo "" +echo "Testing write access to ncaa_fbs_logos directory specifically..." +NCAA_DIR="$ASSETS_DIR/sports/ncaa_fbs_logos" +if [ -d "$NCAA_DIR" ]; then + # Create a test file to verify write access + TEST_FILE="$NCAA_DIR/.permission_test" + if sudo -u "$REAL_USER" touch "$TEST_FILE" 2>/dev/null; then + echo "✓ Successfully created test file in ncaa_fbs_logos directory" + sudo -u "$REAL_USER" rm -f "$TEST_FILE" + echo "✓ Successfully removed test file" + else + echo "✗ Failed to create test file in ncaa_fbs_logos directory" + echo " This indicates the permission fix did not work properly" + fi +else + echo "✗ ncaa_fbs_logos directory does not exist" +fi + +echo "" +echo "Assets permissions fix completed!" +echo "" +echo "The application should now be able to download and save team logos." +echo "If you still see permission errors, check which user is running the LEDMatrix service" +echo "and ensure it matches the owner above ($REAL_USER)." +echo "" +echo "You may need to restart the LEDMatrix service for the changes to take effect:" +echo " sudo systemctl restart ledmatrix.service" diff --git a/migrate_config.sh b/migrate_config.sh new file mode 100644 index 00000000..0000bec4 --- /dev/null +++ b/migrate_config.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +# LED Matrix Configuration Migration Script +# This script helps migrate existing config.json to the new template-based system + +set -e + +echo "==========================================" +echo "LED Matrix Configuration Migration Script" +echo "==========================================" +echo "" + +# Check if we're in the right directory +if [ ! -f "config/config.template.json" ]; then + echo "Error: config/config.template.json not found." + echo "Please run this script from the LEDMatrix project root directory." + exit 1 +fi + +# Check if config.json exists +if [ ! -f "config/config.json" ]; then + echo "No existing config.json found. Creating from template..." + cp config/config.template.json config/config.json + echo "✓ Created config/config.json from template" + echo "" + echo "You can now edit config/config.json with your preferences." + exit 0 +fi + +echo "Existing config.json found. The system will automatically handle migration." +echo "" +echo "What this means:" +echo "- Your current config.json will be preserved" +echo "- New configuration options will be automatically added with default values" +echo "- A backup will be created before any changes" +echo "- The system handles this automatically when it starts" +echo "" +echo "No manual migration is needed. The ConfigManager will handle everything automatically." +echo "" +echo "To see the latest configuration options, you can reference:" +echo " config/config.template.json" +echo "" +echo "Migration complete!" diff --git a/milb_main.py b/milb_main.py deleted file mode 100644 index 490f1b1c..00000000 --- a/milb_main.py +++ /dev/null @@ -1,1230 +0,0 @@ -import time -import logging -import requests -import json -from typing import Dict, Any, List, Optional -from datetime import datetime, timedelta, timezone -import os -from PIL import Image, ImageDraw, ImageFont -import numpy as np -from .cache_manager import CacheManager -from requests.adapters import HTTPAdapter -from urllib3.util.retry import Retry -import pytz - -# Get logger -logger = logging.getLogger(__name__) - -class BaseMiLBManager: - """Base class for MiLB managers with common functionality.""" - def __init__(self, config: Dict[str, Any], display_manager): - self.config = config - self.display_manager = display_manager - self.milb_config = config.get('milb', {}) - self.favorite_teams = self.milb_config.get('favorite_teams', []) - self.show_records = self.milb_config.get('show_records', False) - self.cache_manager = CacheManager() - self.logger = logging.getLogger(__name__) - self.logger.setLevel(logging.INFO) # Set logger level to INFO - - # Load MiLB team mapping - self.team_mapping = {} - self.team_name_to_abbr = {} - team_mapping_path = os.path.join('assets', 'sports', 'milb_logos', 'milb_team_mapping.json') - try: - with open(team_mapping_path, 'r') as f: - self.team_mapping = json.load(f) - self.team_name_to_abbr = {name: data['abbreviation'] for name, data in self.team_mapping.items()} - self.logger.info(f"Loaded {len(self.team_name_to_abbr)} MiLB team mappings.") - except Exception as e: - self.logger.error(f"Failed to load MiLB team mapping: {e}") - - # Logo handling - self.logo_dir = self.milb_config.get('logo_dir', os.path.join('assets', 'sports', 'milb_logos')) - if not os.path.exists(self.logo_dir): - self.logger.warning(f"MiLB logos directory not found: {self.logo_dir}") - try: - os.makedirs(self.logo_dir, exist_ok=True) - self.logger.info(f"Created MiLB logos directory: {self.logo_dir}") - except Exception as e: - self.logger.error(f"Failed to create MiLB logos directory: {e}") - - # Set up session with retry logic - self.session = requests.Session() - retry_strategy = Retry( - total=3, - backoff_factor=1, - status_forcelist=[429, 500, 502, 503, 504] - ) - adapter = HTTPAdapter(max_retries=retry_strategy) - self.session.mount("http://", adapter) - self.session.mount("https://", adapter) - self.headers = { - 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36' - } - - def _get_team_logo(self, team_abbr: str) -> Optional[Image.Image]: - """Get team logo from the configured directory.""" - try: - logo_path = os.path.join(self.logo_dir, f"{team_abbr}.png") - if os.path.exists(logo_path): - logo = Image.open(logo_path) - if logo.mode != 'RGBA': - logo = logo.convert('RGBA') - return logo - else: - logger.warning(f"Logo not found for team {team_abbr}") - return None - except Exception as e: - logger.error(f"Error loading logo for team {team_abbr}: {e}") - return None - - def _draw_text_with_outline(self, draw, text, position, font, fill=(255, 255, 255), outline_color=(0, 0, 0)): - """ - Draw text with a black outline for better readability. - - Args: - draw: ImageDraw object - text: Text to draw - position: (x, y) position to draw the text - font: Font to use - fill: Text color (default: white) - outline_color: Outline color (default: black) - """ - x, y = position - - # Draw the outline by drawing the text in black at 8 positions around the text - for dx, dy in [(-1, -1), (-1, 0), (-1, 1), (0, -1), (0, 1), (1, -1), (1, 0), (1, 1)]: - draw.text((x + dx, y + dy), text, font=font, fill=outline_color) - - # Draw the text in the specified color - draw.text((x, y), text, font=font, fill=fill) - - def _draw_base_indicators(self, draw: ImageDraw.Draw, bases_occupied: List[bool], center_x: int, y: int) -> None: - """Draw base indicators on the display.""" - base_size = 8 # Increased from 6 to 8 for better visibility - base_spacing = 10 # Increased from 8 to 10 for better spacing - - # Draw diamond outline with thicker lines - diamond_points = [ - (center_x, y), # Home - (center_x - base_spacing, y - base_spacing), # First - (center_x, y - 2 * base_spacing), # Second - (center_x + base_spacing, y - base_spacing) # Third - ] - - # Draw thicker diamond outline - for i in range(len(diamond_points)): - start = diamond_points[i] - end = diamond_points[(i + 1) % len(diamond_points)] - draw.line([start, end], fill=(255, 255, 255), width=2) # Added width parameter for thicker lines - - # Draw occupied bases with larger circles and outline - for i, occupied in enumerate(bases_occupied): - x = diamond_points[i+1][0] - base_size//2 - y = diamond_points[i+1][1] - base_size//2 - - # Draw base circle with outline - if occupied: - # Draw white outline - draw.ellipse([x-1, y-1, x + base_size+1, y + base_size+1], fill=(255, 255, 255)) - # Draw filled circle - draw.ellipse([x+1, y+1, x + base_size-1, y + base_size-1], fill=(0, 0, 0)) - else: - # Draw empty base with outline - draw.ellipse([x, y, x + base_size, y + base_size], outline=(255, 255, 255), width=1) - - def _create_game_display(self, game_data: Dict[str, Any]) -> Image.Image: - """Create a display image for an MiLB game with team logos, score, and game state.""" - width = self.display_manager.matrix.width - height = self.display_manager.matrix.height - image = Image.new('RGB', (width, height), color=(0, 0, 0)) - - # Make logos 130% of display dimensions to allow them to extend off screen - max_width = int(width * 1.3) - max_height = int(height * 1.3) - - # Load team logos - away_logo = self._get_team_logo(game_data['away_team']) - home_logo = self._get_team_logo(game_data['home_team']) - - if away_logo and home_logo: - # Resize maintaining aspect ratio - away_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS) - home_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS) - - # Create a single overlay for both logos - overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0)) - - # Calculate vertical center line for alignment - center_y = height // 2 - - # Draw home team logo (far right, extending beyond screen) - home_x = width - home_logo.width + 22 - home_y = center_y - (home_logo.height // 2) - - # Paste the home logo onto the overlay - overlay.paste(home_logo, (home_x, home_y), home_logo) - - # Draw away team logo (far left, extending beyond screen) - away_x = -22 - away_y = center_y - (away_logo.height // 2) - - overlay.paste(away_logo, (away_x, away_y), away_logo) - - # Composite the overlay with the main image - image = image.convert('RGBA') - image = Image.alpha_composite(image, overlay) - image = image.convert('RGB') - - draw = ImageDraw.Draw(image) - - # For upcoming games, show date and time stacked in the center - if game_data['status'] == 'status_scheduled': - # Show "Next Game" at the top using NHL-style font - status_text = "Next Game" - # Set font size for BDF font - self.display_manager.calendar_font.set_char_size(height=7*64) # 7 pixels high, 64 units per pixel - status_width = self.display_manager.get_text_width(status_text, self.display_manager.calendar_font) - status_x = (width - status_width) // 2 - status_y = 2 - # Draw on the current image - self.display_manager.draw = draw - self.display_manager._draw_bdf_text(status_text, status_x, status_y, color=(255, 255, 255), font=self.display_manager.calendar_font) - # Update the display - self.display_manager.update_display() - - # Format game date and time - game_time_str = game_data.get('start_time') - if not game_time_str or 'TBD' in game_time_str: - game_date = "TBD" - game_time_str = "" - else: - game_time = datetime.fromisoformat(game_time_str.replace('Z', '+00:00')) - timezone_str = self.config.get('timezone', 'UTC') - try: - tz = pytz.timezone(timezone_str) - except pytz.exceptions.UnknownTimeZoneError: - logger.warning(f"Unknown timezone: {timezone_str}, falling back to UTC") - tz = pytz.UTC - if game_time.tzinfo is None: - game_time = game_time.replace(tzinfo=pytz.UTC) - local_time = game_time.astimezone(tz) - - # Check date format from config - use_short_date_format = self.config.get('display', {}).get('use_short_date_format', False) - if use_short_date_format: - game_date = local_time.strftime("%-m/%-d") - else: - game_date = self.display_manager.format_date_with_ordinal(local_time) - - game_time_str = self._format_game_time(game_data['start_time']) - - # Draw date and time using NHL-style fonts - date_font = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) - time_font = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) - - # Draw date in center - date_width = draw.textlength(game_date, font=date_font) - date_x = (width - date_width) // 2 - date_y = (height - date_font.size) // 2 - 3 - # draw.text((date_x, date_y), game_date, font=date_font, fill=(255, 255, 255)) - self._draw_text_with_outline(draw, game_date, (date_x, date_y), date_font) - - # Draw time below date - time_width = draw.textlength(game_time_str, font=time_font) - time_x = (width - time_width) // 2 - time_y = date_y + 10 - # draw.text((time_x, time_y), game_time_str, font=time_font, fill=(255, 255, 255)) - self._draw_text_with_outline(draw, game_time_str, (time_x, time_y), time_font) - - # For recent/final games, show scores and status - elif game_data['status'] in ['status_final', 'final', 'completed']: - # Show "Final" at the top using NHL-style font - status_text = "Final" - # Set font size for BDF font - self.display_manager.calendar_font.set_char_size(height=7*64) # 7 pixels high, 64 units per pixel - status_width = self.display_manager.get_text_width(status_text, self.display_manager.calendar_font) - status_x = (width - status_width) // 2 - status_y = 2 - # Draw on the current image - self.display_manager.draw = draw - self.display_manager._draw_bdf_text(status_text, status_x, status_y, color=(255, 255, 255), font=self.display_manager.calendar_font) - # Update the display - self.display_manager.update_display() - - # Draw scores at the bottom using NHL-style font - away_score = str(game_data['away_score']) - home_score = str(game_data['home_score']) - score_text = f"{away_score}-{home_score}" - score_font = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 12) - - # Calculate position for the score text - score_width = draw.textlength(score_text, font=score_font) - score_x = (width - score_width) // 2 - score_y = height - score_font.size - 2 - # draw.text((score_x, score_y), score_text, font=score_font, fill=(255, 255, 255)) - self._draw_text_with_outline(draw, score_text, (score_x, score_y), score_font) - - # Draw records for upcoming and recent games - if self.show_records and game_data['status'] in ['status_scheduled', 'status_final', 'final', 'completed']: - try: - record_font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) - except IOError: - record_font = ImageFont.load_default() - - away_record = game_data.get('away_record', '') - home_record = game_data.get('home_record', '') - - # Using textbbox is more accurate for height than .size - record_bbox = draw.textbbox((0,0), "0-0", font=record_font) - record_height = record_bbox[3] - record_bbox[1] - record_y = height - record_height - - if away_record: - away_record_x = 0 - self._draw_text_with_outline(draw, away_record, (away_record_x, record_y), record_font) - - if home_record: - home_record_bbox = draw.textbbox((0,0), home_record, font=record_font) - home_record_width = home_record_bbox[2] - home_record_bbox[0] - home_record_x = width - home_record_width - self._draw_text_with_outline(draw, home_record, (home_record_x, record_y), record_font) - - return image - - def _format_game_time(self, game_time: str) -> str: - """Format game time for display.""" - try: - # Get timezone from config - timezone_str = self.config.get('timezone', 'UTC') - try: - tz = pytz.timezone(timezone_str) - except pytz.exceptions.UnknownTimeZoneError: - logger.warning(f"Unknown timezone: {timezone_str}, falling back to UTC") - tz = pytz.UTC - - # Convert game time to local timezone - dt = datetime.fromisoformat(game_time.replace('Z', '+00:00')) - if dt.tzinfo is None: - dt = dt.replace(tzinfo=pytz.UTC) - local_dt = dt.astimezone(tz) - - return local_dt.strftime("%I:%M%p").lstrip('0') - except Exception as e: - logger.error(f"Error formatting game time: {e}") - return "TBD" - - def _fetch_milb_api_data(self, use_cache: bool = True) -> Dict[str, Any]: - """Fetch MiLB game data from the MLB Stats API.""" - cache_key = "milb_api_data" - if use_cache: - cached_data = self.cache_manager.get_with_auto_strategy(cache_key) - if cached_data: - self.logger.info("Using cached MiLB API data.") - return cached_data - - try: - # Check if test mode is enabled - if self.milb_config.get('test_mode', False): - self.logger.info("Using test mode data for MiLB") - return { - 'test_game_1': { - 'away_team': 'TOL', - 'home_team': 'BUF', - 'away_score': 3, - 'home_score': 2, - 'status': 'status_in_progress', - 'status_state': 'in', - 'inning': 7, - 'inning_half': 'bottom', - 'balls': 2, - 'strikes': 1, - 'outs': 1, - 'bases_occupied': [True, False, True], # Runner on 1st and 3rd - 'start_time': datetime.now(timezone.utc).isoformat() - } - } - - # MiLB league sport IDs (configurable) - sport_ids = self.milb_config.get('sport_ids', [10, 11, 12, 13, 14, 15]) # Mexican, AAA, AA, A+, A, Rookie - - now = datetime.now(timezone.utc) - # Extend date range to look further into the future for upcoming games - # Look back 1 day and forward 7 days to catch more upcoming games - dates = [(now + timedelta(days=d)).strftime("%Y-%m-%d") for d in range(-1, 8)] - - all_games = {} - - for date in dates: - for sport_id in sport_ids: - url = f"http://statsapi.mlb.com/api/v1/schedule?sportId={sport_id}&date={date}" - try: - self.logger.debug(f"Fetching MiLB games from MLB Stats API: {url}") - response = self.session.get(url, headers=self.headers, timeout=10) - response.raise_for_status() - data = response.json() - except requests.exceptions.RequestException as e: - self.logger.error(f"Error fetching data from {url}: {e}") - continue - - if not data.get('dates') or not data['dates'][0].get('games'): - continue - - for event in data['dates'][0]['games']: - game_pk = event['gamePk'] - - home_team_name = event['teams']['home']['team']['name'] - away_team_name = event['teams']['away']['team']['name'] - - home_abbr = self.team_name_to_abbr.get(home_team_name) - away_abbr = self.team_name_to_abbr.get(away_team_name) - - if not home_abbr: - home_abbr = event['teams']['home']['team'].get('abbreviation', home_team_name[:3].upper()) - self.logger.debug(f"Could not find team abbreviation for '{home_team_name}'. Using '{home_abbr}'.") - if not away_abbr: - away_abbr = event['teams']['away']['team'].get('abbreviation', away_team_name[:3].upper()) - self.logger.debug(f"Could not find team abbreviation for '{away_team_name}'. Using '{away_abbr}'.") - - # Get team records - away_record_data = event['teams']['away'].get('record', {}) - home_record_data = event['teams']['home'].get('record', {}) - away_record = away_record_data.get('wins') - away_losses = away_record_data.get('losses') - home_record = home_record_data.get('wins') - home_losses = home_record_data.get('losses') - if away_record is not None and away_losses is not None and (away_record != 0 or away_losses != 0): - away_record_str = f"{away_record}-{away_losses}" - else: - away_record_str = '' - if home_record is not None and home_losses is not None and (home_record != 0 or home_losses != 0): - home_record_str = f"{home_record}-{home_losses}" - else: - home_record_str = '' - - is_favorite_game = (home_abbr in self.favorite_teams or away_abbr in self.favorite_teams) - - if not self.favorite_teams or is_favorite_game: - status_obj = event['status'] - status_state = status_obj.get('abstractGameState', 'Preview') # Changed default to 'Preview' - - # Map status to a consistent format - status_map = { - 'in progress': 'status_in_progress', - 'final': 'status_final', - 'scheduled': 'status_scheduled', - 'preview': 'status_scheduled' - } - mapped_status = status_map.get(status_obj.get('detailedState', '').lower(), 'status_other') - mapped_status_state = 'in' if mapped_status == 'status_in_progress' else 'post' if mapped_status == 'status_final' else 'pre' - - game_data = { - 'id': game_pk, - 'away_team': away_abbr, - 'home_team': home_abbr, - 'away_score': event['teams']['away'].get('score', 0), - 'home_score': event['teams']['home'].get('score', 0), - 'status': mapped_status, - 'status_state': mapped_status_state, - 'start_time': event['gameDate'], - 'away_record': away_record_str, - 'home_record': home_record_str - } - - if status_state == 'Live': - linescore = event.get('linescore', {}) - game_data['inning'] = linescore.get('currentInning', 1) - inning_state = linescore.get('inningState', 'Top').lower() - game_data['inning_half'] = inning_state - game_data['balls'] = linescore.get('balls', 0) - game_data['strikes'] = linescore.get('strikes', 0) - game_data['outs'] = linescore.get('outs', 0) - game_data['bases_occupied'] = [ - 'first' in linescore.get('offense', {}), - 'second' in linescore.get('offense', {}), - 'third' in linescore.get('offense', {}) - ] - else: - # For non-live games, set defaults - game_data.update({'inning': 1, 'inning_half': 'top', 'balls': 0, 'strikes': 0, 'outs': 0, 'bases_occupied': [False]*3}) - - all_games[game_pk] = game_data - - if use_cache: - self.cache_manager.set(cache_key, all_games) - return all_games - - except Exception as e: - self.logger.error(f"Error fetching MiLB data from MLB Stats API: {e}", exc_info=True) - return {} - - def _extract_game_details(self, game) -> Dict: - game_pk = game.get('id') - home_team_name = game['home']['team']['name'] - away_team_name = game['away']['team']['name'] - - home_abbr = self.team_name_to_abbr.get(home_team_name) - away_abbr = self.team_name_to_abbr.get(away_team_name) - - if not home_abbr: - home_abbr = game['home']['team'].get('abbreviation', home_team_name[:3].upper()) - self.logger.debug(f"Could not find team abbreviation for '{home_team_name}'. Using '{home_abbr}'.") - if not away_abbr: - away_abbr = game['away']['team'].get('abbreviation', away_team_name[:3].upper()) - self.logger.debug(f"Could not find team abbreviation for '{away_team_name}'. Using '{away_abbr}'.") - - # Get team records - away_record = game['away'].get('record', {}).get('wins', 0) - away_losses = game['away'].get('record', {}).get('losses', 0) - home_record = game['home'].get('record', {}).get('wins', 0) - home_losses = game['home'].get('record', {}).get('losses', 0) - away_record_str = f"{away_record}-{away_losses}" - home_record_str = f"{home_record}-{home_losses}" - - is_favorite_game = (home_abbr in self.favorite_teams or away_abbr in self.favorite_teams) - - if not self.favorite_teams or is_favorite_game: - status_obj = game['status'] - status_state = status_obj.get('abstractGameState', 'Final') - - mapped_status = 'unknown' - mapped_status_state = 'unknown' - if status_state == 'Live': - mapped_status = 'status_in_progress' - mapped_status_state = 'in' - elif status_state == 'Final': - mapped_status = 'status_final' - mapped_status_state = 'post' - elif status_state in ['Preview', 'Scheduled']: - mapped_status = 'status_scheduled' - mapped_status_state = 'pre' - - game_data = { - 'away_team': away_abbr, - 'home_team': home_abbr, - 'away_score': game['away']['score'], - 'home_score': game['home']['score'], - 'status': mapped_status, - 'status_state': mapped_status_state, - 'start_time': game['date'], - 'away_record': f"{game['away'].get('record', {}).get('wins', 0)}-{game['away'].get('record', {}).get('losses', 0)}", - 'home_record': f"{game['home'].get('record', {}).get('wins', 0)}-{game['home'].get('record', {}).get('losses', 0)}" - } - - if status_state == 'Live': - linescore = game.get('linescore', {}) - game_data['inning'] = linescore.get('currentInning', 1) - inning_state = linescore.get('inningState', 'Top').lower() - game_data['inning_half'] = 'bottom' if 'bottom' in inning_state else 'top' - - if is_favorite_game: - try: - live_url = f"http://statsapi.mlb.com/api/v1.1/game/{game_pk}/feed/live" - live_response = self.session.get(live_url, headers=self.headers, timeout=5) - live_response.raise_for_status() - live_data = live_response.json().get('liveData', {}) - - linescore_live = live_data.get('linescore', {}) - - # Overwrite score and inning data with more accurate live data from the live feed - if linescore_live: - game_data['away_score'] = linescore_live.get('teams', {}).get('away', {}).get('runs', game_data['away_score']) - game_data['home_score'] = linescore_live.get('teams', {}).get('home', {}).get('runs', game_data['home_score']) - game_data['inning'] = linescore_live.get('currentInning', game_data['inning']) - inning_state_live = linescore_live.get('inningState', '').lower() - if inning_state_live: - game_data['inning_half'] = 'bottom' if 'bottom' in inning_state_live else 'top' - - game_data['balls'] = linescore_live.get('balls', 0) - game_data['strikes'] = linescore_live.get('strikes', 0) - game_data['outs'] = linescore_live.get('outs', 0) - - offense = linescore_live.get('offense', {}) - game_data['bases_occupied'] = [ - 'first' in offense, - 'second' in offense, - 'third' in offense - ] - except Exception as e: - self.logger.warning(f"Could not fetch live details for game {game_pk}: {e}") - game_data.update({'balls': 0, 'strikes': 0, 'outs': 0, 'bases_occupied': [False]*3}) - else: - game_data.update({'balls': 0, 'strikes': 0, 'outs': 0, 'bases_occupied': [False]*3}) - else: - game_data.update({'inning': 1, 'inning_half': 'top', 'balls': 0, 'strikes': 0, 'outs': 0, 'bases_occupied': [False]*3}) - - return game_data - return {} - -class MiLBLiveManager(BaseMiLBManager): - """Manager for displaying live MiLB games.""" - def __init__(self, config: Dict[str, Any], display_manager): - super().__init__(config, display_manager) - self.logger.info("Initialized MiLB Live Manager") - self.live_games = [] - self.current_game = None # Initialize current_game to None - self.current_game_index = 0 - self.last_update = 0 - self.update_interval = self.milb_config.get('live_update_interval', 20) - self.no_data_interval = 300 # 5 minutes when no live games - self.last_game_switch = 0 # Track when we last switched games - self.game_display_duration = self.milb_config.get('live_game_duration', 30) # Display each live game for 30 seconds - self.last_display_update = 0 # Track when we last updated the display - self.last_log_time = 0 - self.log_interval = 300 # Only log status every 5 minutes - self.last_count_log_time = 0 # Track when we last logged count data - self.count_log_interval = 5 # Only log count data every 5 seconds - self.test_mode = self.milb_config.get('test_mode', False) - - # Initialize with test game only if test mode is enabled - if self.test_mode: - self.current_game = { - "home_team": "TOL", - "away_team": "BUF", - "home_score": "3", - "away_score": "2", - "status": "live", - "status_state": "live", - "inning": 5, - "inning_half": "top", - "balls": 2, - "strikes": 1, - "outs": 1, - "bases_occupied": [True, False, True], - "home_logo_path": os.path.join(self.logo_dir, "TOL.png"), - "away_logo_path": os.path.join(self.logo_dir, "BUF.png"), - "start_time": datetime.now(timezone.utc).isoformat(), - } - self.live_games = [self.current_game] - self.logger.info("Initialized MiLBLiveManager with test game: TOL vs BUF") - else: - self.logger.info("Initialized MiLBLiveManager in live mode") - - def update(self): - """Update live game data.""" - current_time = time.time() - # Use longer interval if no game data - interval = self.no_data_interval if not self.live_games else self.update_interval - - if current_time - self.last_update >= interval: - self.last_update = current_time - - if self.test_mode: - # For testing, we'll just update the game state to show it's working - if self.current_game: - # Update inning half - if self.current_game["inning_half"] == "top": - self.current_game["inning_half"] = "bottom" - else: - self.current_game["inning_half"] = "top" - self.current_game["inning"] += 1 - - # Update count - self.current_game["balls"] = (self.current_game["balls"] + 1) % 4 - self.current_game["strikes"] = (self.current_game["strikes"] + 1) % 3 - - # Update outs - self.current_game["outs"] = (self.current_game["outs"] + 1) % 3 - - # Update bases - self.current_game["bases_occupied"] = [ - not self.current_game["bases_occupied"][0], - not self.current_game["bases_occupied"][1], - not self.current_game["bases_occupied"][2] - ] - - # Update score occasionally - if self.current_game["inning"] % 2 == 0: - self.current_game["home_score"] = str(int(self.current_game["home_score"]) + 1) - else: - self.current_game["away_score"] = str(int(self.current_game["away_score"]) + 1) - else: - # Fetch live game data from MiLB API - games = self._fetch_milb_api_data(use_cache=False) - if games: - # Find all live games involving favorite teams - new_live_games = [] - for game in games.values(): - # Only process games that are actually in progress - if game['status_state'] == 'in' and game['status'] == 'status_in_progress': - if not self.favorite_teams or ( - game['home_team'] in self.favorite_teams or - game['away_team'] in self.favorite_teams - ): - # Ensure scores are valid numbers - try: - game['home_score'] = int(game['home_score']) - game['away_score'] = int(game['away_score']) - new_live_games.append(game) - except (ValueError, TypeError): - self.logger.warning(f"Invalid score format for game {game['away_team']} @ {game['home_team']}") - - # Only log if there's a change in games or enough time has passed - should_log = ( - current_time - self.last_log_time >= self.log_interval or - len(new_live_games) != len(self.live_games) or - not self.live_games # Log if we had no games before - ) - - if should_log: - if new_live_games: - logger.info(f"[MiLB] Found {len(new_live_games)} live games") - for game in new_live_games: - logger.info(f"[MiLB] Live game: {game['away_team']} vs {game['home_team']} - {game['inning_half']}{game['inning']}, {game['balls']}-{game['strikes']}") - else: - logger.info("[MiLB] No live games found") - self.last_log_time = current_time - - if new_live_games: - # Update the current game with the latest data - for new_game in new_live_games: - if self.current_game and ( - (new_game['home_team'] == self.current_game['home_team'] and - new_game['away_team'] == self.current_game['away_team']) or - (new_game['home_team'] == self.current_game['away_team'] and - new_game['away_team'] == self.current_game['home_team']) - ): - self.current_game = new_game - break - - # Only update the games list if we have new games - if not self.live_games or set(game['away_team'] + game['home_team'] for game in new_live_games) != set(game['away_team'] + game['home_team'] for game in self.live_games): - self.live_games = new_live_games - # If we don't have a current game or it's not in the new list, start from the beginning - if not self.current_game or self.current_game not in self.live_games: - self.current_game_index = 0 - self.current_game = self.live_games[0] - self.last_game_switch = current_time - - # Always update display when we have new data, but limit to once per second - if current_time - self.last_display_update >= 1.0: - # self.display(force_clear=True) # REMOVED: DisplayController handles this - self.last_display_update = current_time - else: - # No live games found - self.live_games = [] - self.current_game = None - - # Check if it's time to switch games - if len(self.live_games) > 1 and (current_time - self.last_game_switch) >= self.game_display_duration: - self.current_game_index = (self.current_game_index + 1) % len(self.live_games) - self.current_game = self.live_games[self.current_game_index] - self.last_game_switch = current_time - # Force display update when switching games - # self.display(force_clear=True) # REMOVED: DisplayController handles this - self.last_display_update = current_time - - def _create_live_game_display(self, game_data: Dict[str, Any]) -> Image.Image: - """Create a display image for a live MiLB game.""" - width = self.display_manager.matrix.width - height = self.display_manager.matrix.height - image = Image.new('RGB', (width, height), color=(0, 0, 0)) - - # Make logos 130% of display dimensions to allow them to extend off screen - max_width = int(width * 1.3) - max_height = int(height * 1.3) - - # Load and place team logos - away_logo = self._get_team_logo(game_data['away_team']) - home_logo = self._get_team_logo(game_data['home_team']) - - if away_logo and home_logo: - # Resize maintaining aspect ratio - away_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS) - home_logo.thumbnail((max_width, max_height), Image.Resampling.LANCZOS) - - # Create a single overlay for both logos - overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0)) - - # Calculate vertical center line for alignment - center_y = height // 2 - - # Draw home team logo (far right, extending beyond screen) - home_x = width - home_logo.width + 18 - home_y = center_y - (home_logo.height // 2) - - # Paste the home logo onto the overlay - overlay.paste(home_logo, (home_x, home_y), home_logo) - - # Draw away team logo (far left, extending beyond screen) - away_x = -18 - away_y = center_y - (away_logo.height // 2) - - overlay.paste(away_logo, (away_x, away_y), away_logo) - - # Composite the overlay with the main image - image = image.convert('RGBA') - image = Image.alpha_composite(image, overlay) - image = image.convert('RGB') - - draw = ImageDraw.Draw(image) - - # --- Live Game Specific Elements --- - - # Define default text color - text_color = (255, 255, 255) - - # Draw Inning (Top Center) - inning_half_indicator = "▲" if game_data['inning_half'] == 'top' else "▼" - inning_text = f"{inning_half_indicator}{game_data['inning']}" - inning_bbox = draw.textbbox((0, 0), inning_text, font=self.display_manager.font) - inning_width = inning_bbox[2] - inning_bbox[0] - inning_x = (width - inning_width) // 2 - inning_y = 1 # Position near top center - # draw.text((inning_x, inning_y), inning_text, fill=(255, 255, 255), font=self.display_manager.font) - self._draw_text_with_outline(draw, inning_text, (inning_x, inning_y), self.display_manager.font) - - # --- REVISED BASES AND OUTS DRAWING --- - bases_occupied = game_data['bases_occupied'] # [1st, 2nd, 3rd] - outs = game_data.get('outs', 0) - inning_half = game_data['inning_half'] - - # Define geometry - base_diamond_size = 7 - out_circle_diameter = 3 - out_vertical_spacing = 2 # Space between out circles - spacing_between_bases_outs = 3 # Horizontal space between base cluster and out column - base_vert_spacing = 1 # Internal vertical space in base cluster - base_horiz_spacing = 1 # Internal horizontal space in base cluster - - # Calculate cluster dimensions - base_cluster_height = base_diamond_size + base_vert_spacing + base_diamond_size - base_cluster_width = base_diamond_size + base_horiz_spacing + base_diamond_size - out_cluster_height = 3 * out_circle_diameter + 2 * out_vertical_spacing - out_cluster_width = out_circle_diameter - - # Calculate overall start positions - overall_start_y = inning_bbox[3] + 0 # Start immediately below inning text (moved up 3 pixels) - - # Center the BASE cluster horizontally - bases_origin_x = (width - base_cluster_width) // 2 - - # Determine relative positions for outs based on inning half - if inning_half == 'top': # Away batting, outs on left - outs_column_x = bases_origin_x - spacing_between_bases_outs - out_cluster_width - else: # Home batting, outs on right - outs_column_x = bases_origin_x + base_cluster_width + spacing_between_bases_outs - - # Calculate vertical alignment offset for outs column (center align with bases cluster) - outs_column_start_y = overall_start_y + (base_cluster_height // 2) - (out_cluster_height // 2) - - # --- Draw Bases (Diamonds) --- - base_color_occupied = (255, 255, 255) - base_color_empty = (255, 255, 255) # Outline color - h_d = base_diamond_size // 2 - - # 2nd Base (Top center relative to bases_origin_x) - c2x = bases_origin_x + base_cluster_width // 2 - c2y = overall_start_y + h_d - poly2 = [(c2x, overall_start_y), (c2x + h_d, c2y), (c2x, c2y + h_d), (c2x - h_d, c2y)] - if bases_occupied[1]: draw.polygon(poly2, fill=base_color_occupied) - else: draw.polygon(poly2, outline=base_color_empty) - - base_bottom_y = c2y + h_d # Bottom Y of 2nd base diamond - - # 3rd Base (Bottom left relative to bases_origin_x) - c3x = bases_origin_x + h_d - c3y = base_bottom_y + base_vert_spacing + h_d - poly3 = [(c3x, base_bottom_y + base_vert_spacing), (c3x + h_d, c3y), (c3x, c3y + h_d), (c3x - h_d, c3y)] - if bases_occupied[2]: draw.polygon(poly3, fill=base_color_occupied) - else: draw.polygon(poly3, outline=base_color_empty) - - # 1st Base (Bottom right relative to bases_origin_x) - c1x = bases_origin_x + base_cluster_width - h_d - c1y = base_bottom_y + base_vert_spacing + h_d - poly1 = [(c1x, base_bottom_y + base_vert_spacing), (c1x + h_d, c1y), (c1x, c1y + h_d), (c1x - h_d, c1y)] - if bases_occupied[0]: draw.polygon(poly1, fill=base_color_occupied) - else: draw.polygon(poly1, outline=base_color_empty) - - # --- Draw Outs (Vertical Circles) --- - circle_color_out = (255, 255, 255) - circle_color_empty_outline = (100, 100, 100) - - for i in range(3): - cx = outs_column_x - cy = outs_column_start_y + i * (out_circle_diameter + out_vertical_spacing) - coords = [cx, cy, cx + out_circle_diameter, cy + out_circle_diameter] - if i < outs: - draw.ellipse(coords, fill=circle_color_out) - else: - draw.ellipse(coords, outline=circle_color_empty_outline) - - # --- Draw Balls-Strikes Count (BDF Font) --- - balls = game_data.get('balls', 0) - strikes = game_data.get('strikes', 0) - - # Add debug logging for count with cooldown - current_time = time.time() - if (game_data['home_team'] in self.favorite_teams or game_data['away_team'] in self.favorite_teams) and \ - current_time - self.last_count_log_time >= self.count_log_interval: - self.logger.debug(f"[MiLB] Displaying count: {balls}-{strikes}") - self.logger.debug(f"[MiLB] Raw count data: balls={game_data.get('balls')}, strikes={game_data.get('strikes')}") - self.last_count_log_time = current_time - - count_text = f"{balls}-{strikes}" - bdf_font = self.display_manager.calendar_font - bdf_font.set_char_size(height=7*64) # Set 7px height - count_text_width = self.display_manager.get_text_width(count_text, bdf_font) - - # Position below the base/out cluster - cluster_bottom_y = overall_start_y + base_cluster_height # Find the bottom of the taller part (bases) - count_y = cluster_bottom_y + 2 # Start 2 pixels below cluster - - # Center horizontally within the BASE cluster width - count_x = bases_origin_x + (base_cluster_width - count_text_width) // 2 - - # Ensure draw object is set and draw text - self.display_manager.draw = draw - # self.display_manager._draw_bdf_text(count_text, count_x, count_y, text_color, font=bdf_font) - # Use _draw_text_with_outline for count text - # self._draw_text_with_outline(draw, count_text, (count_x, count_y), bdf_font, fill=text_color) - - # Draw Balls-Strikes Count with outline using BDF font - # Define outline color (consistent with _draw_text_with_outline default) - outline_color_for_bdf = (0, 0, 0) - - # Draw outline - for dx_offset, dy_offset in [(-1, -1), (-1, 0), (-1, 1), (0, -1), (0, 1), (1, -1), (1, 0), (1, 1)]: - self.display_manager._draw_bdf_text(count_text, count_x + dx_offset, count_y + dy_offset, color=outline_color_for_bdf, font=bdf_font) - - # Draw main text - self.display_manager._draw_bdf_text(count_text, count_x, count_y, color=text_color, font=bdf_font) - - # Draw Team:Score at the bottom - score_font = self.display_manager.font # Use PressStart2P - outline_color = (0, 0, 0) - score_text_color = (255, 255, 255) # Use a specific name for score text color - - # Helper function for outlined text - def draw_bottom_outlined_text(x, y, text): - # Draw outline - # draw.text((x-1, y), text, font=score_font, fill=outline_color) - # draw.text((x+1, y), text, font=score_font, fill=outline_color) - # draw.text((x, y-1), text, font=score_font, fill=outline_color) - # draw.text((x, y+1), text, font=score_font, fill=outline_color) - # # Draw main text - # draw.text((x, y), text, font=score_font, fill=score_text_color) - self._draw_text_with_outline(draw, text, (x,y), score_font, fill=score_text_color, outline_color=outline_color) - - away_abbr = game_data['away_team'] - home_abbr = game_data['home_team'] - away_score_str = str(game_data['away_score']) - home_score_str = str(game_data['home_score']) - - away_text = f"{away_abbr}:{away_score_str}" - home_text = f"{home_abbr}:{home_score_str}" - - # Calculate Y position (bottom edge) - # Get font height (approximate or precise) - try: - font_height = score_font.getbbox("A")[3] - score_font.getbbox("A")[1] - except AttributeError: - font_height = 8 # Fallback for default font - score_y = height - font_height - 1 # 1 pixel padding from bottom - - # Away Team:Score (Bottom Left) - away_score_x = 2 # 2 pixels padding from left - # draw.text((away_score_x, score_y), away_text, font=score_font, fill=text_color) - draw_bottom_outlined_text(away_score_x, score_y, away_text) - - # Home Team:Score (Bottom Right) - home_text_bbox = draw.textbbox((0,0), home_text, font=score_font) - home_text_width = home_text_bbox[2] - home_text_bbox[0] - home_score_x = width - home_text_width - 2 # 2 pixels padding from right - # draw.text((home_score_x, score_y), home_text, font=score_font, fill=text_color) - draw_bottom_outlined_text(home_score_x, score_y, home_text) - - # TODO: Add Outs display if needed - - return image - - def display(self, force_clear: bool = False): - """Display live game information.""" - if not self.current_game: - return - - try: - # Create and display the game image using the new method - game_image = self._create_live_game_display(self.current_game) - # Set the image in the display manager - self.display_manager.image = game_image - self.display_manager.draw = ImageDraw.Draw(self.display_manager.image) - # Update the display - self.display_manager.update_display() - except Exception as e: - logger.error(f"[MiLB] Error displaying live game: {e}", exc_info=True) - -class MiLBRecentManager(BaseMiLBManager): - """Manager for displaying recent MiLB games.""" - def __init__(self, config: Dict[str, Any], display_manager): - super().__init__(config, display_manager) - self.logger.info("Initialized MiLB Recent Manager") - self.recent_games = [] - self.current_game = None - self.current_game_index = 0 - self.last_update = 0 - self.update_interval = self.milb_config.get('recent_update_interval', 3600) # 1 hour - self.recent_games_to_show = self.milb_config.get('recent_games_to_show', 5) # Show last 5 games - self.last_game_switch = 0 # Track when we last switched games - self.game_display_duration = 10 # Display each game for 10 seconds - self.last_warning_time = 0 - self.warning_cooldown = 300 # Only show warning every 5 minutes - logger.info(f"Initialized MiLBRecentManager with {len(self.favorite_teams)} favorite teams") - self.last_log_time = 0 - self.log_interval = 300 # 5 minutes - - def update(self): - """Update recent games data.""" - current_time = time.time() - if current_time - self.last_update >= self.update_interval: - self.last_update = current_time - else: - return - - try: - # Fetch data from MiLB API - games = self._fetch_milb_api_data(use_cache=True) - if not games: - logger.warning("[MiLB] No games returned from API") - return - - logger.info(f"[MiLB] Fetched {len(games)} total games from API") - - # Process games - new_recent_games = [] - - logger.info(f"[MiLB] Processing {len(games)} games for recent games...") - - # Log all games found for debugging - all_games_log = [] - favorite_games_log = [] - - for game_id, game in games.items(): - # Convert game time to UTC datetime - game_time_str = game['start_time'].replace('Z', '+00:00') - game_time = datetime.fromisoformat(game_time_str) - if game_time.tzinfo is None: - game_time = game_time.replace(tzinfo=timezone.utc) - - # Check if this is a favorite team game - is_favorite_game = (game['home_team'] in self.favorite_teams or - game['away_team'] in self.favorite_teams) - - # Log all games for debugging - game_info = f"{game['away_team']} @ {game['home_team']} (Status: {game['status']}, State: {game['status_state']})" - all_games_log.append(game_info) - - if is_favorite_game: - favorite_games_log.append(game_info) - logger.info(f"[MiLB] Found favorite team game: {game['away_team']} @ {game['home_team']}") - logger.info(f"[MiLB] Game time (UTC): {game_time}") - logger.info(f"[MiLB] Game status: {game['status']}, State: {game['status_state']}") - logger.info(f"[MiLB] Scores: {game['away_team']} {game.get('away_score', 0)} - {game['home_team']} {game.get('home_score', 0)}") - - # Use status_state to determine if game is final - is_final = game['status_state'] in ['post', 'final', 'completed'] - - self.logger.info(f"[MiLB] Game Time: {game_time.isoformat()}") - self.logger.info(f"[MiLB] Is final: {is_final}") - - # Only add favorite team games that are final - if is_final: - self.logger.info(f"[MiLB] Adding game {game_id} to recent games list.") - new_recent_games.append(game) - else: - self.logger.info(f"[MiLB] Skipping game {game_id} - not final.") - - # Log summary of all games found - logger.info(f"[MiLB] All games found ({len(all_games_log)}): {all_games_log}") - logger.info(f"[MiLB] Favorite team games found ({len(favorite_games_log)}): {favorite_games_log}") - - # Sort by game time (most recent first) and limit to recent_games_to_show - new_recent_games.sort(key=lambda x: x['start_time'], reverse=True) - new_recent_games = new_recent_games[:self.recent_games_to_show] - - if new_recent_games: - logger.info(f"[MiLB] Found {len(new_recent_games)} recent final games for favorite teams: {self.favorite_teams}") - self.recent_games = new_recent_games - if not self.current_game: - self.current_game = self.recent_games[0] - else: - # Fallback: if no final games found, show any recent games for favorite teams - logger.info("[MiLB] No final games found for favorite teams, checking for any recent games...") - fallback_games = [] - for game_id, game in games.items(): - if (game['home_team'] in self.favorite_teams or game['away_team'] in self.favorite_teams): - game_time_str = game['start_time'].replace('Z', '+00:00') - game_time = datetime.fromisoformat(game_time_str) - if game_time.tzinfo is None: - game_time = game_time.replace(tzinfo=timezone.utc) - - # Include any game from the last 7 days - if game_time >= datetime.now(timezone.utc) - timedelta(days=7): - fallback_games.append(game) - logger.info(f"[MiLB] Added fallback game: {game['away_team']} @ {game['home_team']} (Status: {game['status_state']})") - - fallback_games.sort(key=lambda x: x['start_time'], reverse=True) - fallback_games = fallback_games[:self.recent_games_to_show] - - if fallback_games: - logger.info(f"[MiLB] Found {len(fallback_games)} fallback games for favorite teams") - self.recent_games = fallback_games - if not self.current_game: - self.current_game = self.recent_games[0] - else: - logger.info("[MiLB] No recent games found for favorite teams (including fallback)") - self.recent_games = [] - self.current_game = None - - self.last_update = current_time - - except Exception as e: - logger.error(f"[MiLB] Error updating recent games: {e}", exc_info=True) - - def display(self, force_clear: bool = False): - """Display recent games.""" - if not self.recent_games: - current_time = time.time() - if current_time - self.last_warning_time > self.warning_cooldown: - logger.info("[MiLB] No recent games to display") - self.last_warning_time = current_time - return # Skip display update entirely - - try: - current_time = time.time() - - # Check if it's time to switch games - if len(self.recent_games) > 1 and current_time - self.last_game_switch >= self.game_display_duration: - # Move to next game - self.current_game_index = (self.current_game_index + 1) % len(self.recent_games) - self.current_game = self.recent_games[self.current_game_index] - self.last_game_switch = current_time - force_clear = True # Force clear when switching games - - # Create and display the game image - game_image = self._create_game_display(self.current_game) - self.display_manager.image = game_image - self.display_manager.draw = ImageDraw.Draw(self.display_manager.image) - self.display_manager.update_display() - - except Exception as e: - logger.error(f"[MiLB] Error displaying recent game: {e}", exc_info=True) - -class MiLBUpcomingManager(BaseMiLBManager): - """Manager for upcoming MiLB games.""" - def __init__(self, config: Dict[str, Any], display_manager): - super().__init__(config, display_manager) - self.logger = logging.getLogger(__name__) - self.upcoming_games = [] - self.current_game = None - self.current_game_index = 0 - self.last_update = 0 - self.update_interval = self.milb_config.get('upcoming_update_interval', 3600) # 1 hour - self.upcoming_games_to_show = self.milb_config.get('upcoming_games_to_show', 10) # Show next 10 games - self.last_warning_time = 0 - self.warning_cooldown = 300 # Only show warning every 5 minutes - self.last_game_switch = 0 # Track when we last switched games - self.game_display_duration = 10 # Display each game for 10 seconds - self.logger.info(f"Initialized MiLBUpcomingManager with {len(self.favorite_teams)} favorite teams") - - def update(self): - """Update upcoming games data.""" - current_time = time.time() - self.logger.debug(f"[MiLB] show_favorite_teams_only: {self.milb_config.get('show_favorite_teams_only', False)}") - self.logger.debug(f"[MiLB] favorite_teams: {self.favorite_teams}") - if self.last_update != 0 and (current_time - self.last_update < self.update_interval): - return - - try: - # Fetch data from MiLB API - games = self._fetch_milb_api_data(use_cache=True) - if not games: - self.logger.warning("[MiLB] No games returned from API for upcoming games update.") - return - - # --- Optimization: Filter for favorite teams before processing --- - if self.milb_config.get("show_favorite_teams_only", False): - games = { - game_id: game for game_id, game in games.items() - if game['home_team'] in self.favorite_teams or game['away_team'] in self.favorite_teams - } - self.logger.info(f"[MiLB Upcoming] Filtered to {len(games)} games for favorite teams.") - - # Process games - new_upcoming_games = [] - - self.logger.info(f"[MiLB] Processing {len(games)} games for upcoming games...") - - now_utc = datetime.now(timezone.utc) - for game_id, game in games.items(): - self.logger.debug(f"[MiLB] Processing game {game_id} for upcoming games...") - - game_time = datetime.fromisoformat(game['start_time'].replace('Z', '+00:00')) - if game_time.tzinfo is None: - game_time = game_time.replace(tzinfo=timezone.utc) - - is_upcoming = ( - game['status_state'] not in ['post', 'final', 'completed'] and - game_time > now_utc - ) - - # Add debug logging for upcoming games logic - self.logger.debug(f"[MiLB] Game {game['away_team']} @ {game['home_team']}:") - self.logger.debug(f"[MiLB] Game time: {game_time}") - self.logger.debug(f"[MiLB] Current time: {now_utc}") - self.logger.debug(f"[MiLB] Status state: {game['status_state']}") - self.logger.debug(f"[MiLB] Is upcoming: {is_upcoming}") - - if is_upcoming: - new_upcoming_games.append(game) - self.logger.info(f"[MiLB] Added upcoming game: {game['away_team']} @ {game['home_team']} at {game_time}") - - # Sort by game time (soonest first) and limit to upcoming_games_to_show - new_upcoming_games.sort(key=lambda x: x['start_time']) - new_upcoming_games = new_upcoming_games[:self.upcoming_games_to_show] - - if new_upcoming_games: - self.logger.info(f"[MiLB] Found {len(new_upcoming_games)} upcoming games for favorite teams") - self.upcoming_games = new_upcoming_games - if not self.current_game: - self.current_game = self.upcoming_games[0] - else: - self.logger.info("[MiLB] No upcoming games found for favorite teams") - self.upcoming_games = [] - self.current_game = None - - self.last_update = current_time - - except Exception as e: - self.logger.error(f"[MiLB] Error updating upcoming games: {e}", exc_info=True) - - def display(self, force_clear: bool = False): - """Display upcoming games.""" - if not self.upcoming_games: - current_time = time.time() - if current_time - self.last_warning_time > self.warning_cooldown: - self.logger.info("[MiLB] No upcoming games to display") - self.last_warning_time = current_time - return # Skip display update entirely - - try: - current_time = time.time() - - # Check if it's time to switch games - if len(self.upcoming_games) > 1 and current_time - self.last_game_switch >= self.game_display_duration: - # Move to next game - self.current_game_index = (self.current_game_index + 1) % len(self.upcoming_games) - self.current_game = self.upcoming_games[self.current_game_index] - self.last_game_switch = current_time - force_clear = True # Force clear when switching games - - # Create and display the game image - if self.current_game: - game_image = self._create_game_display(self.current_game) - self.display_manager.image = game_image - self.display_manager.draw = ImageDraw.Draw(self.display_manager.image) - self.display_manager.update_display() - - except Exception as e: - self.logger.error(f"[MiLB] Error displaying upcoming game: {e}", exc_info=True) \ No newline at end of file diff --git a/enable_news_manager.py b/scripts/enable_news_manager.py similarity index 97% rename from enable_news_manager.py rename to scripts/enable_news_manager.py index c7891ee5..dda25083 100644 --- a/enable_news_manager.py +++ b/scripts/enable_news_manager.py @@ -101,7 +101,7 @@ def show_status(): def main(): if len(sys.argv) < 2: - print("Usage: python3 enable_news_manager.py [enable|disable|status]") + print("Usage: python3 scripts/enable_news_manager.py [enable|disable|status]") sys.exit(1) command = sys.argv[1].lower() diff --git a/install_dependencies_apt.py b/scripts/install_dependencies_apt.py similarity index 100% rename from install_dependencies_apt.py rename to scripts/install_dependencies_apt.py diff --git a/src/config_manager.py b/src/config_manager.py index 84c264ea..6d2a2991 100644 --- a/src/config_manager.py +++ b/src/config_manager.py @@ -7,6 +7,7 @@ class ConfigManager: # Use current working directory as base self.config_path = config_path or "config/config.json" self.secrets_path = secrets_path or "config/config_secrets.json" + self.template_path = "config/config.template.json" self.config: Dict[str, Any] = {} def get_config_path(self) -> str: @@ -18,11 +19,18 @@ class ConfigManager: def load_config(self) -> Dict[str, Any]: """Load configuration from JSON files.""" try: + # Check if config file exists, if not create from template + if not os.path.exists(self.config_path): + self._create_config_from_template() + # Load main config print(f"Attempting to load config from: {os.path.abspath(self.config_path)}") with open(self.config_path, 'r') as f: self.config = json.load(f) + # Migrate config to add any new items from template + self._migrate_config() + # Load and merge secrets if they exist (be permissive on errors) if os.path.exists(self.secrets_path): try: @@ -118,6 +126,85 @@ class ConfigManager: else: target[key] = value + def _create_config_from_template(self) -> None: + """Create config.json from template if it doesn't exist.""" + if not os.path.exists(self.template_path): + raise FileNotFoundError(f"Template file not found at {os.path.abspath(self.template_path)}") + + print(f"Creating config.json from template at {os.path.abspath(self.template_path)}") + + # Ensure config directory exists + os.makedirs(os.path.dirname(self.config_path), exist_ok=True) + + # Copy template to config + with open(self.template_path, 'r') as template_file: + template_data = json.load(template_file) + + with open(self.config_path, 'w') as config_file: + json.dump(template_data, config_file, indent=4) + + print(f"Created config.json from template at {os.path.abspath(self.config_path)}") + + def _migrate_config(self) -> None: + """Migrate config to add new items from template with defaults.""" + if not os.path.exists(self.template_path): + print(f"Template file not found at {os.path.abspath(self.template_path)}, skipping migration") + return + + try: + with open(self.template_path, 'r') as f: + template_config = json.load(f) + + # Check if migration is needed + if self._config_needs_migration(self.config, template_config): + print("Config migration needed - adding new configuration items with defaults") + + # Create backup of current config + backup_path = f"{self.config_path}.backup" + with open(backup_path, 'w') as backup_file: + json.dump(self.config, backup_file, indent=4) + print(f"Created backup of current config at {os.path.abspath(backup_path)}") + + # Merge template defaults into current config + self._merge_template_defaults(self.config, template_config) + + # Save migrated config + with open(self.config_path, 'w') as f: + json.dump(self.config, f, indent=4) + + print(f"Config migration completed and saved to {os.path.abspath(self.config_path)}") + else: + print("Config is up to date, no migration needed") + + except Exception as e: + print(f"Error during config migration: {e}") + # Don't raise - continue with current config + + def _config_needs_migration(self, current_config: Dict[str, Any], template_config: Dict[str, Any]) -> bool: + """Check if config needs migration by comparing with template.""" + return self._has_new_keys(current_config, template_config) + + def _has_new_keys(self, current: Dict[str, Any], template: Dict[str, Any]) -> bool: + """Recursively check if template has keys not in current config.""" + for key, value in template.items(): + if key not in current: + return True + if isinstance(value, dict) and isinstance(current[key], dict): + if self._has_new_keys(current[key], value): + return True + return False + + def _merge_template_defaults(self, current: Dict[str, Any], template: Dict[str, Any]) -> None: + """Recursively merge template defaults into current config.""" + for key, value in template.items(): + if key not in current: + # Add new key with template value + current[key] = value + print(f"Added new config key: {key}") + elif isinstance(value, dict) and isinstance(current[key], dict): + # Recursively merge nested dictionaries + self._merge_template_defaults(current[key], value) + def get_timezone(self) -> str: """Get the configured timezone.""" return self.config.get('timezone', 'UTC') diff --git a/src/display_controller.py b/src/display_controller.py index d730c973..227c9cb5 100644 --- a/src/display_controller.py +++ b/src/display_controller.py @@ -578,6 +578,11 @@ class DisplayController: self.display_manager.defer_update(self.stocks.update_stock_data, priority=2) if self.news: self.display_manager.defer_update(self.news.update_news_data, priority=2) + # Defer sport manager updates that might do heavy API fetching + if hasattr(self, 'ncaa_fb_live') and self.ncaa_fb_live: + self.display_manager.defer_update(self.ncaa_fb_live.update, priority=3) + if hasattr(self, 'nfl_live') and self.nfl_live: + self.display_manager.defer_update(self.nfl_live.update, priority=3) # Continue with non-scrolling-sensitive updates if self.weather: self.weather.get_weather() if self.calendar: self.calendar.update(time.time()) diff --git a/src/logo_downloader.py b/src/logo_downloader.py index 281377ea..3eb365c3 100644 --- a/src/logo_downloader.py +++ b/src/logo_downloader.py @@ -32,7 +32,17 @@ class LogoDownloader: 'fcs': 'https://site.api.espn.com/apis/site/v2/sports/football/college-football/teams', # FCS teams from same endpoint 'ncaam_basketball': 'https://site.api.espn.com/apis/site/v2/sports/basketball/mens-college-basketball/teams', 'ncaa_baseball': 'https://site.api.espn.com/apis/site/v2/sports/baseball/college-baseball/teams', - "ncaam_hockey": "https://site.api.espn.com/apis/site/v2/sports/hockey/mens-college-hockey/teams" + "ncaam_hockey": "https://site.api.espn.com/apis/site/v2/sports/hockey/mens-college-hockey/teams", + # Soccer leagues + 'soccer_eng.1': 'https://site.api.espn.com/apis/site/v2/sports/soccer/eng.1/teams', + 'soccer_esp.1': 'https://site.api.espn.com/apis/site/v2/sports/soccer/esp.1/teams', + 'soccer_ger.1': 'https://site.api.espn.com/apis/site/v2/sports/soccer/ger.1/teams', + 'soccer_ita.1': 'https://site.api.espn.com/apis/site/v2/sports/soccer/ita.1/teams', + 'soccer_fra.1': 'https://site.api.espn.com/apis/site/v2/sports/soccer/fra.1/teams', + 'soccer_por.1': 'https://site.api.espn.com/apis/site/v2/sports/soccer/por.1/teams', + 'soccer_uefa.champions': 'https://site.api.espn.com/apis/site/v2/sports/soccer/uefa.champions/teams', + 'soccer_uefa.europa': 'https://site.api.espn.com/apis/site/v2/sports/soccer/uefa.europa/teams', + 'soccer_usa.1': 'https://site.api.espn.com/apis/site/v2/sports/soccer/usa.1/teams' } # Directory mappings for different leagues @@ -47,6 +57,16 @@ class LogoDownloader: 'ncaam_basketball': 'assets/sports/ncaa_logos', 'ncaa_baseball': 'assets/sports/ncaa_logos', 'ncaam_hockey': 'assets/sports/ncaa_logos', + # Soccer leagues - all use the same soccer_logos directory + 'soccer_eng.1': 'assets/sports/soccer_logos', + 'soccer_esp.1': 'assets/sports/soccer_logos', + 'soccer_ger.1': 'assets/sports/soccer_logos', + 'soccer_ita.1': 'assets/sports/soccer_logos', + 'soccer_fra.1': 'assets/sports/soccer_logos', + 'soccer_por.1': 'assets/sports/soccer_logos', + 'soccer_uefa.champions': 'assets/sports/soccer_logos', + 'soccer_uefa.europa': 'assets/sports/soccer_logos', + 'soccer_usa.1': 'assets/sports/soccer_logos' } def __init__(self, request_timeout: int = 30, retry_attempts: int = 3): @@ -607,6 +627,20 @@ class LogoDownloader: return converted_count, failed_count +# Helper function to map soccer league codes to logo downloader format +def get_soccer_league_key(league_code: str) -> str: + """ + Map soccer league codes to logo downloader format. + + Args: + league_code: Soccer league code (e.g., 'eng.1', 'por.1') + + Returns: + Logo downloader league key (e.g., 'soccer_eng.1', 'soccer_por.1') + """ + return f"soccer_{league_code}" + + # Convenience function for easy integration def download_missing_logo(team_abbreviation: str, league: str, team_name: str = None, create_placeholder: bool = True) -> bool: """ diff --git a/src/milb_manager.py b/src/milb_manager.py index ae3a08ee..a7bb542b 100644 --- a/src/milb_manager.py +++ b/src/milb_manager.py @@ -1502,9 +1502,28 @@ class MiLBRecentManager(BaseMiLBManager): logger.info(f"[MiLB] All games found ({len(all_games_log)}): {all_games_log}") logger.info(f"[MiLB] Favorite team games found ({len(favorite_games_log)}): {favorite_games_log}") - # Sort by game time (most recent first) and limit to recent_games_to_show + # Sort by game time (most recent first) and apply per-team logic new_recent_games.sort(key=lambda x: x.get('start_time', ''), reverse=True) - new_recent_games = new_recent_games[:self.recent_games_to_show] + + # If showing favorite teams only, select one game per team + if self.milb_config.get("show_favorite_teams_only", False): + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in new_recent_games + if game.get('home_team') == team or game.get('away_team') == team] + + if team_specific_games: + # Take the most recent (first in sorted list) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda x: x.get('start_time', ''), reverse=True) + new_recent_games = team_games + else: + # Limit to configured number if not using favorite teams only + new_recent_games = new_recent_games[:self.recent_games_to_show] if new_recent_games: logger.info(f"[MiLB] Found {len(new_recent_games)} recent final games for favorite teams: {self.favorite_teams}") @@ -1716,9 +1735,28 @@ class MiLBUpcomingManager(BaseMiLBManager): self.logger.info(f"[MiLB] Added upcoming game: {game.get('away_team')} @ {game.get('home_team')} at {game_time}") self.logger.debug(f"[MiLB] Game data for upcoming: {game}") - # Sort by game time (soonest first) and limit to upcoming_games_to_show + # Sort by game time (soonest first) and apply per-team logic new_upcoming_games.sort(key=lambda x: x.get('start_time', '')) - new_upcoming_games = new_upcoming_games[:self.upcoming_games_to_show] + + # If showing favorite teams only, select one game per team + if self.milb_config.get("show_favorite_teams_only", False): + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in new_upcoming_games + if game.get('home_team') == team or game.get('away_team') == team] + + if team_specific_games: + # Take the earliest (first in sorted list) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda x: x.get('start_time', '')) + new_upcoming_games = team_games + else: + # Limit to configured number if not using favorite teams only + new_upcoming_games = new_upcoming_games[:self.upcoming_games_to_show] self.logger.info(f"[MiLB] Found {len(new_upcoming_games)} upcoming games after processing") # Compare new list with old list to see if an update is needed diff --git a/src/mlb_manager.py b/src/mlb_manager.py index 56d1b752..40374511 100644 --- a/src/mlb_manager.py +++ b/src/mlb_manager.py @@ -1223,9 +1223,28 @@ class MLBRecentManager(BaseMLBManager): self.logger.info(f"[MLB] All games found ({len(all_games_log)}): {all_games_log}") self.logger.info(f"[MLB] Favorite team games found ({len(favorite_games_log)}): {favorite_games_log}") - # Sort by game time (most recent first) and limit to recent_games_to_show + # Sort by game time (most recent first) and apply per-team logic new_recent_games.sort(key=lambda x: x['start_time'], reverse=True) - new_recent_games = new_recent_games[:self.recent_games_to_show] + + # If showing favorite teams only, select one game per team + if self.mlb_config.get("show_favorite_teams_only", False): + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in new_recent_games + if game['home_team'] == team or game['away_team'] == team] + + if team_specific_games: + # Take the most recent (first in sorted list) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda x: x['start_time'], reverse=True) + new_recent_games = team_games + else: + # Limit to configured number if not using favorite teams only + new_recent_games = new_recent_games[:self.recent_games_to_show] if new_recent_games: logger.info(f"[MLB] Found {len(new_recent_games)} recent games for favorite teams: {self.favorite_teams}") @@ -1345,9 +1364,28 @@ class MLBUpcomingManager(BaseMLBManager): else: self.logger.info(f"[MLB] Skipping game {game_id} - not upcoming.") - # Sort by game time (soonest first) and limit to upcoming_games_to_show + # Sort by game time (soonest first) and apply per-team logic new_upcoming_games.sort(key=lambda x: x['start_time']) - new_upcoming_games = new_upcoming_games[:self.upcoming_games_to_show] + + # If showing favorite teams only, select one game per team + if self.mlb_config.get("show_favorite_teams_only", False): + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in new_upcoming_games + if game['home_team'] == team or game['away_team'] == team] + + if team_specific_games: + # Take the earliest (first in sorted list) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda x: x['start_time']) + new_upcoming_games = team_games + else: + # Limit to configured number if not using favorite teams only + new_upcoming_games = new_upcoming_games[:self.upcoming_games_to_show] if new_upcoming_games: logger.info(f"[MLB] Found {len(new_upcoming_games)} upcoming games for favorite teams") diff --git a/src/music_manager.py b/src/music_manager.py index 4b24c269..efa254b7 100644 --- a/src/music_manager.py +++ b/src/music_manager.py @@ -27,10 +27,7 @@ except ImportError: logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s') logger = logging.getLogger(__name__) -# Define paths relative to this file's location -CONFIG_DIR = os.path.join(os.path.dirname(__file__), '..', 'config') -CONFIG_PATH = os.path.join(CONFIG_DIR, 'config.json') -# SECRETS_PATH is handled within SpotifyClient +# Note: Config is now passed in from DisplayController instead of being loaded separately class MusicSource(Enum): NONE = auto() @@ -72,37 +69,32 @@ class MusicManager: def _load_config(self): default_interval = 2 - # default_preferred_source = "auto" # Removed self.enabled = False # Assume disabled until config proves otherwise - if not os.path.exists(CONFIG_PATH): - logging.warning(f"Config file not found at {CONFIG_PATH}. Music manager disabled.") + # Use the config that was already loaded and passed to us instead of loading our own + if self.config is None: + logging.warning("No config provided to MusicManager. Music manager disabled.") return try: - with open(CONFIG_PATH, 'r') as f: - config_data = json.load(f) - music_config = config_data.get("music", {}) + music_config = self.config.get("music", {}) - self.enabled = music_config.get("enabled", False) - if not self.enabled: - logging.info("Music manager is disabled in config.json (top level 'enabled': false).") - return # Don't proceed further if disabled + self.enabled = music_config.get("enabled", False) + if not self.enabled: + logging.info("Music manager is disabled in config.json (top level 'enabled': false).") + return # Don't proceed further if disabled - self.polling_interval = music_config.get("POLLING_INTERVAL_SECONDS", default_interval) - configured_source = music_config.get("preferred_source", "spotify").lower() + self.polling_interval = music_config.get("POLLING_INTERVAL_SECONDS", default_interval) + configured_source = music_config.get("preferred_source", "spotify").lower() - if configured_source in ["spotify", "ytm"]: - self.preferred_source = configured_source - logging.info(f"Music manager enabled. Polling interval: {self.polling_interval}s. Preferred source: {self.preferred_source}") - else: - logging.warning(f"Invalid 'preferred_source' ('{configured_source}') in config.json. Must be 'spotify' or 'ytm'. Music manager disabled.") - self.enabled = False - return + if configured_source in ["spotify", "ytm"]: + self.preferred_source = configured_source + logging.info(f"Music manager enabled. Polling interval: {self.polling_interval}s. Preferred source: {self.preferred_source}") + else: + logging.warning(f"Invalid 'preferred_source' ('{configured_source}') in config.json. Must be 'spotify' or 'ytm'. Music manager disabled.") + self.enabled = False + return - except json.JSONDecodeError: - logging.error(f"Error decoding JSON from {CONFIG_PATH}. Music manager disabled.") - self.enabled = False except Exception as e: logging.error(f"Error loading music config: {e}. Music manager disabled.") self.enabled = False @@ -777,10 +769,22 @@ class MusicManager: ARTIST_Y_PERCENT = 0.34 # 34% from top ALBUM_Y_PERCENT = 0.60 # 60% from top - # Calculate actual pixel positions + # Get font height for artist/album text + try: + artist_album_font_height = self.display_manager.get_font_height(font_artist_album) + except: + artist_album_font_height = LINE_HEIGHT_BDF # Fallback to BDF height + + # Ensure we have a reasonable shift (minimum 6 pixels) + font_shift = max(artist_album_font_height, 6) + + # Calculate actual pixel positions, shifted down by font height y_pos_title_top = 1 - y_pos_artist_top = int(matrix_height * ARTIST_Y_PERCENT) - y_pos_album_top = int(matrix_height * ALBUM_Y_PERCENT) + y_pos_artist_top = int(matrix_height * ARTIST_Y_PERCENT) + font_shift + + # For album, use a smaller shift to ensure it fits above progress bar + album_shift = min(font_shift, 5) # Cap album shift at 5 pixels to preserve space + y_pos_album_top = int(matrix_height * ALBUM_Y_PERCENT) + album_shift TEXT_SCROLL_DIVISOR = 5 @@ -916,15 +920,12 @@ if __name__ == '__main__': # The MusicManager expects the overall config, not just the music part directly for its _load_config # So we simulate a config object that has a .get('music', {}) method. - # However, MusicManager's _load_config reads from CONFIG_PATH. - # For a true standalone test, we might need to mock file IO or provide a test config file. + # MusicManager now uses the passed config instead of loading from file. # Simplified test: - # manager = MusicManager(display_manager=mock_display, config=mock_config_main) # This won't work due to file reading + manager = MusicManager(display_manager=mock_display, config=mock_config_main) - # To truly test, you'd point CONFIG_PATH to a test config.json or mock open() - # For now, this __main__ block is mostly a placeholder. - logger.info("MusicManager standalone test setup is complex due to file dependencies for config.") + logger.info("MusicManager standalone test setup completed.") logger.info("To test: run the main application and observe logs from MusicManager.") # if manager.enabled: # manager.start_polling() diff --git a/src/nba_managers.py b/src/nba_managers.py index 4a873f21..48364046 100644 --- a/src/nba_managers.py +++ b/src/nba_managers.py @@ -759,15 +759,30 @@ class NBARecentManager(BaseNBAManager): # Filter for favorite teams only if the config is set if self.nba_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_recent_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_recent_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the most recent + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) else: team_games = new_recent_games - - # Sort games by start time, most recent first, then limit to recent_games_to_show - team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) - team_games = team_games[:self.recent_games_to_show] + # Sort games by start time, most recent first, then limit to recent_games_to_show + team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) + team_games = team_games[:self.recent_games_to_show] self.recent_games = team_games if self.recent_games: @@ -838,15 +853,30 @@ class NBAUpcomingManager(BaseNBAManager): # Filter for favorite teams only if the config is set if self.nba_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_upcoming_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_upcoming_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the earliest + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) else: team_games = new_upcoming_games - - # Sort games by start time, soonest first, then limit to configured count - team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) - team_games = team_games[:self.upcoming_games_to_show] + # Sort games by start time, soonest first, then limit to configured count + team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) + team_games = team_games[:self.upcoming_games_to_show] self.upcoming_games = team_games if self.upcoming_games: diff --git a/src/ncaa_baseball_managers.py b/src/ncaa_baseball_managers.py index fe20b7ef..eab46be9 100644 --- a/src/ncaa_baseball_managers.py +++ b/src/ncaa_baseball_managers.py @@ -908,14 +908,32 @@ class NCAABaseballRecentManager(BaseNCAABaseballManager): # Filter for favorite teams only if the config is set if self.ncaa_baseball_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_recent_games if game['home_team'] in self.favorite_teams or game['away_team'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_recent_games + if game['home_team'] in self.favorite_teams or + game['away_team'] in self.favorite_teams] + + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_team'] == team or game['away_team'] == team] + + if team_specific_games: + # Sort by game time and take the most recent + team_specific_games.sort(key=lambda g: g.get('start_time'), reverse=True) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda g: g.get('start_time'), reverse=True) else: team_games = new_recent_games - - if team_games: # Sort by game time (most recent first), then limit to recent_games_to_show team_games = sorted(team_games, key=lambda g: g.get('start_time'), reverse=True) team_games = team_games[:self.recent_games_to_show] + + if team_games: logger.info(f"[NCAABaseball] Found {len(team_games)} recent games for favorite teams (limited to {self.recent_games_to_show}): {self.favorite_teams}") self.recent_games = team_games if not self.current_game or self.current_game.get('id') not in [g.get('id') for g in self.recent_games]: @@ -1010,14 +1028,32 @@ class NCAABaseballUpcomingManager(BaseNCAABaseballManager): # Filter for favorite teams only if the config is set if self.ncaa_baseball_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_upcoming_games if game['home_team'] in self.favorite_teams or game['away_team'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_upcoming_games + if game['home_team'] in self.favorite_teams or + game['away_team'] in self.favorite_teams] + + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_team'] == team or game['away_team'] == team] + + if team_specific_games: + # Sort by game time and take the earliest + team_specific_games.sort(key=lambda g: g.get('start_time')) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda g: g.get('start_time')) else: team_games = new_upcoming_games - - if team_games: # Sort by game time (soonest first), then limit to configured count team_games = sorted(team_games, key=lambda g: g.get('start_time')) team_games = team_games[:self.upcoming_games_to_show] + + if team_games: logger.info(f"[NCAABaseball] Found {len(team_games)} upcoming games for favorite teams (limited to {self.upcoming_games_to_show})") self.upcoming_games = team_games if not self.current_game or self.current_game.get('id') not in [g.get('id') for g in self.upcoming_games]: diff --git a/src/ncaa_fb_managers.py b/src/ncaa_fb_managers.py index 21b637a7..ca9b896b 100644 --- a/src/ncaa_fb_managers.py +++ b/src/ncaa_fb_managers.py @@ -208,8 +208,10 @@ class BaseNCAAFBManager: # Renamed class def _fetch_ncaa_fb_api_data(self, use_cache: bool = True) -> Optional[Dict]: """ - Fetches the full season schedule for NCAAFB, caches it, and then filters - for relevant games based on the current configuration. + Fetches the full season schedule for NCAAFB using week-by-week approach to ensure + we get all games, then caches the complete dataset. + + This method now uses background threading to prevent blocking the display. """ now = datetime.now(pytz.utc) current_year = now.year @@ -227,7 +229,25 @@ class BaseNCAAFBManager: # Renamed class all_events.extend(cached_data) continue + # Check if we're already fetching this year's data in background + if hasattr(self, '_background_fetching') and year in self._background_fetching: + self.logger.info(f"[NCAAFB] Background fetch already in progress for {year}, using partial data") + # Return partial data if available, or trigger background fetch + partial_data = self._get_partial_schedule_data(year) + if partial_data: + all_events.extend(partial_data) + continue + self.logger.info(f"[NCAAFB] Fetching full {year} season schedule from ESPN API...") + + # Start background fetch for complete data + self._start_background_schedule_fetch(year) + + # For immediate response, fetch current/recent games only + year_events = self._fetch_immediate_games(year) + all_events.extend(year_events) + + # Also try to fetch full season data immediately as fallback try: url = f"https://site.api.espn.com/apis/site/v2/sports/football/college-football/scoreboard" response = self.session.get(url, params={"dates": year,"seasontype":2,"limit":1000},headers=self.headers, timeout=15) @@ -247,6 +267,115 @@ class BaseNCAAFBManager: # Renamed class return None return {'events': all_events} + + def _fetch_immediate_games(self, year: int) -> List[Dict]: + """Fetch immediate games (current week + next few days) for quick display.""" + immediate_events = [] + + try: + # Fetch current week and next few days for immediate display + now = datetime.now(pytz.utc) + for days_offset in range(-1, 7): # Yesterday through next 6 days + check_date = now + timedelta(days=days_offset) + date_str = check_date.strftime('%Y%m%d') + + url = f"https://site.api.espn.com/apis/site/v2/sports/football/college-football/scoreboard?dates={date_str}" + response = self.session.get(url, headers=self.headers, timeout=10) + response.raise_for_status() + data = response.json() + date_events = data.get('events', []) + immediate_events.extend(date_events) + + if days_offset == 0: # Today + self.logger.debug(f"[NCAAFB] Immediate fetch - Current date ({date_str}): {len(date_events)} events") + + except requests.exceptions.RequestException as e: + self.logger.warning(f"[NCAAFB] Error fetching immediate games for {year}: {e}") + + return immediate_events + + def _start_background_schedule_fetch(self, year: int): + """Start background thread to fetch complete season schedule.""" + import threading + + if not hasattr(self, '_background_fetching'): + self._background_fetching = set() + + if year in self._background_fetching: + return # Already fetching + + self._background_fetching.add(year) + + def background_fetch(): + try: + start_time = time.time() + self.logger.info(f"[NCAAFB] Starting background fetch for {year} season...") + year_events = [] + + # Fetch week by week to ensure we get complete season data + for week in range(1, 16): + # Add timeout check to prevent infinite background fetching + if time.time() - start_time > 300: # 5 minute timeout + self.logger.warning(f"[NCAAFB] Background fetch timeout after 5 minutes for {year}") + break + + try: + url = f"https://site.api.espn.com/apis/site/v2/sports/football/college-football/scoreboard?seasontype=2&week={week}" + response = self.session.get(url, headers=self.headers, timeout=15) + response.raise_for_status() + data = response.json() + week_events = data.get('events', []) + year_events.extend(week_events) + + # Log progress for first few weeks + if week <= 3: + self.logger.debug(f"[NCAAFB] Background - Week {week}: fetched {len(week_events)} events") + + # If no events found for this week, we might be past the season + if not week_events and week > 10: + self.logger.debug(f"[NCAAFB] Background - No events found for week {week}, ending season fetch") + break + + except requests.exceptions.RequestException as e: + self.logger.warning(f"[NCAAFB] Background - Error fetching week {week} for {year}: {e}") + continue + + # Also fetch postseason games (bowl games, playoffs) if we haven't timed out + if time.time() - start_time < 300: + try: + url = f"https://site.api.espn.com/apis/site/v2/sports/football/college-football/scoreboard?seasontype=3" + response = self.session.get(url, headers=self.headers, timeout=15) + response.raise_for_status() + data = response.json() + postseason_events = data.get('events', []) + year_events.extend(postseason_events) + self.logger.debug(f"[NCAAFB] Background - Postseason: fetched {len(postseason_events)} events") + except requests.exceptions.RequestException as e: + self.logger.warning(f"[NCAAFB] Background - Error fetching postseason for {year}: {e}") + + # Cache the complete data + cache_key = f"ncaafb_schedule_{year}" + self.cache_manager.set(cache_key, year_events) + elapsed_time = time.time() - start_time + self.logger.info(f"[NCAAFB] Background fetch completed for {year}: {len(year_events)} events cached in {elapsed_time:.1f}s") + + except Exception as e: + self.logger.error(f"[NCAAFB] Background fetch failed for {year}: {e}") + finally: + self._background_fetching.discard(year) + + # Start background thread + fetch_thread = threading.Thread(target=background_fetch, daemon=True) + fetch_thread.start() + + def _get_partial_schedule_data(self, year: int) -> List[Dict]: + """Get partial schedule data if available from cache or previous fetch.""" + cache_key = f"ncaafb_schedule_{year}" + cached_data = self.cache_manager.get(cache_key, max_age=self.season_cache_duration * 2) # Allow older data + if cached_data: + self.logger.debug(f"[NCAAFB] Using partial cached data for {year}: {len(cached_data)} events") + return cached_data + return [] def _fetch_data(self, date_str: str = None) -> Optional[Dict]: """Fetch data using shared data mechanism or direct fetch for live.""" @@ -469,7 +598,7 @@ class BaseNCAAFBManager: # Renamed class # Only log debug info for favorite team games if is_favorite_game: self.logger.debug(f"[NCAAFB] Processing favorite team game: {game_event.get('id')}") - self.logger.debug(f"[NCAAFB] Found teams: {away_abbr}@{home_abbr}, Status: {status['type']['name']}") + self.logger.debug(f"[NCAAFB] Found teams: {away_abbr}@{home_abbr}, Status: {status['type']['name']}, State: {status['type']['state']}") home_record = home_team.get('records', [{}])[0].get('summary', '') if home_team.get('records') else '' away_record = away_team.get('records', [{}])[0].get('summary', '') if away_team.get('records') else '' @@ -499,15 +628,37 @@ class BaseNCAAFBManager: # Renamed class situation = competition.get("situation") down_distance_text = "" possession_indicator = None # Default to None + scoring_event = "" # Track scoring events + if situation and status["type"]["state"] == "in": down = situation.get("down") distance = situation.get("distance") - if down and distance is not None: + # Validate down and distance values before formatting + if (down is not None and isinstance(down, int) and 1 <= down <= 4 and + distance is not None and isinstance(distance, int) and distance >= 0): down_str = {1: "1st", 2: "2nd", 3: "3rd", 4: "4th"}.get(down, f"{down}th") dist_str = f"& {distance}" if distance > 0 else "& Goal" down_distance_text = f"{down_str} {dist_str}" elif situation.get("isRedZone"): down_distance_text = "Red Zone" # Simplified if down/distance not present but in redzone + + # Detect scoring events from status detail + status_detail = status["type"].get("detail", "").lower() + status_short = status["type"].get("shortDetail", "").lower() + + # Check for scoring events in status text + if any(keyword in status_detail for keyword in ["touchdown", "td"]): + scoring_event = "TOUCHDOWN" + elif any(keyword in status_detail for keyword in ["field goal", "fg"]): + scoring_event = "FIELD GOAL" + elif any(keyword in status_detail for keyword in ["extra point", "pat", "point after"]): + scoring_event = "PAT" + elif any(keyword in status_short for keyword in ["touchdown", "td"]): + scoring_event = "TOUCHDOWN" + elif any(keyword in status_short for keyword in ["field goal", "fg"]): + scoring_event = "FIELD GOAL" + elif any(keyword in status_short for keyword in ["extra point", "pat"]): + scoring_event = "PAT" # Determine possession based on team ID possession_team_id = situation.get("possession") @@ -524,14 +675,13 @@ class BaseNCAAFBManager: # Renamed class if period == 0: period_text = "Start" # Before kickoff elif period == 1: period_text = "Q1" elif period == 2: period_text = "Q2" - elif period == 3: period_text = "HALF" # Halftime is usually period 3 in API - elif period == 4: period_text = "Q3" - elif period == 5: period_text = "Q4" - elif period > 5: period_text = "OT" # Assuming OT starts at period 6+ + elif period == 3: period_text = "Q3" # Fixed: period 3 is 3rd quarter, not halftime + elif period == 4: period_text = "Q4" + elif period > 4: period_text = "OT" # OT starts after Q4 elif status["type"]["state"] == "halftime" or status["type"]["name"] == "STATUS_HALFTIME": # Check explicit halftime state period_text = "HALF" elif status["type"]["state"] == "post": - if period > 5 : period_text = "Final/OT" + if period > 4 : period_text = "Final/OT" else: period_text = "Final" elif status["type"]["state"] == "pre": period_text = game_time # Show time for upcoming @@ -555,7 +705,8 @@ class BaseNCAAFBManager: # Renamed class "clock": status.get("displayClock", "0:00"), "is_live": status["type"]["state"] == "in", "is_final": status["type"]["state"] == "post", - "is_upcoming": status["type"]["state"] == "pre", + "is_upcoming": (status["type"]["state"] == "pre" or + status["type"]["name"].lower() in ['scheduled', 'pre-game', 'status_scheduled']), "is_halftime": status["type"]["state"] == "halftime" or status["type"]["name"] == "STATUS_HALFTIME", # Added halftime check "home_abbr": home_abbr, "home_score": home_team.get("score", "0"), @@ -572,6 +723,7 @@ class BaseNCAAFBManager: # Renamed class "down_distance_text": down_distance_text, # Added Down/Distance "possession": situation.get("possession") if situation else None, # ID of team with possession "possession_indicator": possession_indicator, # Added for easy home/away check + "scoring_event": scoring_event, # Track scoring events (TOUCHDOWN, FIELD GOAL, PAT) "is_within_window": is_within_window, # Whether game is within display window } @@ -700,11 +852,13 @@ class NCAAFBLiveManager(BaseNCAAFBManager): # Renamed class minutes -= 1 if minutes < 0: # Simulate end of quarter/game - if self.current_game["period"] < 5: # Assuming 5 is Q4 end + if self.current_game["period"] < 4: # Q4 is period 4 self.current_game["period"] += 1 # Update period_text based on new period - if self.current_game["period"] == 3: self.current_game["period_text"] = "HALF" - elif self.current_game["period"] == 5: self.current_game["period_text"] = "Q4" + if self.current_game["period"] == 1: self.current_game["period_text"] = "Q1" + elif self.current_game["period"] == 2: self.current_game["period_text"] = "Q2" + elif self.current_game["period"] == 3: self.current_game["period_text"] = "Q3" + elif self.current_game["period"] == 4: self.current_game["period_text"] = "Q4" # Reset clock for next quarter (e.g., 15:00) minutes, seconds = 15, 0 else: @@ -892,9 +1046,29 @@ class NCAAFBLiveManager(BaseNCAAFBManager): # Renamed class status_y = 1 # Position at top self._draw_text_with_outline(draw_overlay, period_clock_text, (status_x, status_y), self.fonts['time']) - # Down & Distance (Below Period/Clock) + # Down & Distance or Scoring Event (Below Period/Clock) + scoring_event = game.get("scoring_event", "") down_distance = game.get("down_distance_text", "") - if down_distance and game.get("is_live"): # Only show if live and available + + # Show scoring event if detected, otherwise show down & distance + if scoring_event and game.get("is_live"): + # Display scoring event with special formatting + event_width = draw_overlay.textlength(scoring_event, font=self.fonts['detail']) + event_x = (self.display_width - event_width) // 2 + event_y = (self.display_height) - 7 + + # Color coding for different scoring events + if scoring_event == "TOUCHDOWN": + event_color = (255, 215, 0) # Gold + elif scoring_event == "FIELD GOAL": + event_color = (0, 255, 0) # Green + elif scoring_event == "PAT": + event_color = (255, 165, 0) # Orange + else: + event_color = (255, 255, 255) # White + + self._draw_text_with_outline(draw_overlay, scoring_event, (event_x, event_y), self.fonts['detail'], fill=event_color) + elif down_distance and game.get("is_live"): # Only show if live and available dd_width = draw_overlay.textlength(down_distance, font=self.fonts['detail']) dd_x = (self.display_width - dd_width) // 2 dd_y = (self.display_height)- 7 # Top of D&D text @@ -1009,34 +1183,63 @@ class NCAAFBRecentManager(BaseNCAAFBManager): # Renamed class events = data['events'] # self.logger.info(f"[NCAAFB Recent] Processing {len(events)} events from shared data.") # Changed log prefix - # Process games and filter for final games & favorite teams + # Define date range for "recent" games (last 21 days to capture games from 3 weeks ago) + now = datetime.now(timezone.utc) + recent_cutoff = now - timedelta(days=21) + self.logger.info(f"[NCAAFB Recent DEBUG] Current time: {now}, Recent cutoff: {recent_cutoff} (21 days ago)") + + # Process games and filter for final games, date range & favorite teams processed_games = [] favorite_games_found = 0 for event in events: game = self._extract_game_details(event) - # Filter criteria: must be final + # Filter criteria: must be final AND within recent date range if game and game['is_final']: - processed_games.append(game) - # Count favorite team games for logging - if (game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams): - favorite_games_found += 1 + game_time = game.get('start_time_utc') + if game_time and game_time >= recent_cutoff: + processed_games.append(game) + # Count favorite team games for logging + if (game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams): + favorite_games_found += 1 + + # Special check for Tennessee game in recent games + if (game['home_abbr'] == 'TENN' and game['away_abbr'] == 'UGA') or (game['home_abbr'] == 'UGA' and game['away_abbr'] == 'TENN'): + self.logger.info(f"[NCAAFB Recent DEBUG] Found Tennessee game in recent: {game['away_abbr']} @ {game['home_abbr']} - {game.get('start_time_utc')} - Score: {game['away_score']}-{game['home_score']}") # Filter for favorite teams if self.favorite_teams: - team_games = [game for game in processed_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] - self.logger.info(f"[NCAAFB Recent] Found {favorite_games_found} favorite team games out of {len(processed_games)} total final games") + # Get all games involving favorite teams + favorite_team_games = [game for game in processed_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + self.logger.info(f"[NCAAFB Recent] Found {favorite_games_found} favorite team games out of {len(processed_games)} total final games within last 21 days") + + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the most recent + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) + + # Debug: Show which games are selected for display + for i, game in enumerate(team_games): + self.logger.info(f"[NCAAFB Recent DEBUG] Game {i+1} for display: {game['away_abbr']} @ {game['home_abbr']} - {game.get('start_time_utc')} - Score: {game['away_score']}-{game['home_score']}") else: team_games = processed_games # Show all recent games if no favorites defined - self.logger.info(f"[NCAAFB Recent] Found {len(processed_games)} total final games (no favorite teams configured)") - - # Sort by game time, most recent first - team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) - - # Limit to the specified number of recent games - team_games = team_games[:self.recent_games_to_show] + self.logger.info(f"[NCAAFB Recent] Found {len(processed_games)} total final games within last 21 days (no favorite teams configured)") + # Sort by game time, most recent first + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) + # Limit to the specified number of recent games + team_games = team_games[:self.recent_games_to_show] # Check if the list of games to display has changed new_game_ids = {g['id'] for g in team_games} @@ -1287,8 +1490,14 @@ class NCAAFBUpcomingManager(BaseNCAAFBManager): # Renamed class processed_games = [] favorite_games_found = 0 + all_upcoming_games = 0 # Count all upcoming games regardless of favorites + for event in events: game = self._extract_game_details(event) + # Count all upcoming games for debugging + if game and game['is_upcoming']: + all_upcoming_games += 1 + # Filter criteria: must be upcoming ('pre' state) if game and game['is_upcoming']: # Only fetch odds for games that will be displayed @@ -1305,22 +1514,77 @@ class NCAAFBUpcomingManager(BaseNCAAFBManager): # Renamed class if self.show_odds: self._fetch_odds(game) - # Summary logging instead of verbose debug - self.logger.info(f"[NCAAFB Upcoming] Found {len(processed_games)} total upcoming games") + # Enhanced logging for debugging + self.logger.info(f"[NCAAFB Upcoming] Found {all_upcoming_games} total upcoming games in data") + self.logger.info(f"[NCAAFB Upcoming] Found {len(processed_games)} upcoming games after filtering") + + # Debug: Check what statuses we're seeing + status_counts = {} + status_names = {} # Track actual status names from ESPN + favorite_team_games = [] + for event in events: + game = self._extract_game_details(event) + if game: + status = "upcoming" if game['is_upcoming'] else "final" if game['is_final'] else "live" if game['is_live'] else "other" + status_counts[status] = status_counts.get(status, 0) + 1 + + # Track actual ESPN status names + actual_status = event.get('competitions', [{}])[0].get('status', {}).get('type', {}) + status_name = actual_status.get('name', 'Unknown') + status_state = actual_status.get('state', 'Unknown') + status_names[f"{status_name} ({status_state})"] = status_names.get(f"{status_name} ({status_state})", 0) + 1 + + # Check for favorite team games regardless of status + if (game['home_abbr'] in self.favorite_teams or game['away_abbr'] in self.favorite_teams): + favorite_team_games.append({ + 'teams': f"{game['away_abbr']} @ {game['home_abbr']}", + 'status': status, + 'date': game.get('start_time_utc', 'Unknown'), + 'espn_status': f"{status_name} ({status_state})" + }) + + # Special check for Tennessee game (Georgia @ Tennessee) + if (game['home_abbr'] == 'TENN' and game['away_abbr'] == 'UGA') or (game['home_abbr'] == 'UGA' and game['away_abbr'] == 'TENN'): + self.logger.info(f"[NCAAFB DEBUG] Found Tennessee game: {game['away_abbr']} @ {game['home_abbr']} - {status} - {game.get('start_time_utc')} - ESPN: {status_name} ({status_state})") + + self.logger.info(f"[NCAAFB Upcoming] Status breakdown: {status_counts}") + self.logger.info(f"[NCAAFB Upcoming] ESPN status names: {status_names}") + if favorite_team_games: + self.logger.info(f"[NCAAFB Upcoming] Favorite team games found: {len(favorite_team_games)}") + for game in favorite_team_games[:3]: # Show first 3 + self.logger.info(f"[NCAAFB Upcoming] {game['teams']} - {game['status']} - {game['date']} - ESPN: {game['espn_status']}") + + if self.favorite_teams and all_upcoming_games > 0: + self.logger.info(f"[NCAAFB Upcoming] Favorite teams: {self.favorite_teams}") + self.logger.info(f"[NCAAFB Upcoming] Found {favorite_games_found} favorite team upcoming games") # Filter for favorite teams only if the config is set if self.ncaa_fb_config.get("show_favorite_teams_only", False): - team_games = [game for game in processed_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in processed_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the earliest + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) else: team_games = processed_games # Show all upcoming if no favorites - - # Sort by game time, earliest first - team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) - - # Limit to the specified number of upcoming games - team_games = team_games[:self.upcoming_games_to_show] + # Sort by game time, earliest first + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) + # Limit to the specified number of upcoming games + team_games = team_games[:self.upcoming_games_to_show] # Log changes or periodically should_log = ( diff --git a/src/ncaam_basketball_managers.py b/src/ncaam_basketball_managers.py index 4dd3f7c1..d58b4f8a 100644 --- a/src/ncaam_basketball_managers.py +++ b/src/ncaam_basketball_managers.py @@ -828,15 +828,30 @@ class NCAAMBasketballRecentManager(BaseNCAAMBasketballManager): # Filter for favorite teams only if the config is set if self.ncaam_basketball_config.get("show_favorite_teams_only", False): - new_team_games = [game for game in new_recent_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_recent_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (most recent game for each team) + new_team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the most recent + team_specific_games.sort(key=lambda g: g.get('start_time_utc', datetime.min.replace(tzinfo=timezone.utc)), reverse=True) + new_team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + new_team_games.sort(key=lambda g: g.get('start_time_utc', datetime.min.replace(tzinfo=timezone.utc)), reverse=True) else: new_team_games = new_recent_games - - # Sort by game time (most recent first), then limit to recent_games_to_show - new_team_games.sort(key=lambda g: g.get('start_time_utc', datetime.min.replace(tzinfo=timezone.utc)), reverse=True) - new_team_games = new_team_games[:self.recent_games_to_show] + # Sort by game time (most recent first), then limit to recent_games_to_show + new_team_games.sort(key=lambda g: g.get('start_time_utc', datetime.min.replace(tzinfo=timezone.utc)), reverse=True) + new_team_games = new_team_games[:self.recent_games_to_show] # Only log if there's a change in games or enough time has passed should_log = ( @@ -964,15 +979,30 @@ class NCAAMBasketballUpcomingManager(BaseNCAAMBasketballManager): # Filter for favorite teams only if the config is set if self.ncaam_basketball_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_upcoming_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_upcoming_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the earliest + team_specific_games.sort(key=lambda g: g.get('start_time_utc', datetime.max.replace(tzinfo=timezone.utc))) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda g: g.get('start_time_utc', datetime.max.replace(tzinfo=timezone.utc))) else: team_games = new_upcoming_games - - # Sort by game time (soonest first), then limit to configured count - team_games.sort(key=lambda g: g.get('start_time_utc', datetime.max.replace(tzinfo=timezone.utc))) - team_games = team_games[:self.upcoming_games_to_show] + # Sort by game time (soonest first), then limit to configured count + team_games.sort(key=lambda g: g.get('start_time_utc', datetime.max.replace(tzinfo=timezone.utc))) + team_games = team_games[:self.upcoming_games_to_show] if self._should_log("team_games_upcoming", 300): diff --git a/src/nfl_managers.py b/src/nfl_managers.py index ed8deddd..f7f37289 100644 --- a/src/nfl_managers.py +++ b/src/nfl_managers.py @@ -351,16 +351,38 @@ class BaseNFLManager: # Renamed class situation = competition.get("situation") down_distance_text = "" possession_indicator = None # Default to None + scoring_event = "" # Track scoring events + if situation and status["type"]["state"] == "in": down = situation.get("down") distance = situation.get("distance") - if down and distance is not None: + # Validate down and distance values before formatting + if (down is not None and isinstance(down, int) and 1 <= down <= 4 and + distance is not None and isinstance(distance, int) and distance >= 0): down_str = {1: "1st", 2: "2nd", 3: "3rd", 4: "4th"}.get(down, f"{down}th") dist_str = f"& {distance}" if distance > 0 else "& Goal" down_distance_text = f"{down_str} {dist_str}" elif situation.get("isRedZone"): down_distance_text = "Red Zone" # Simplified if down/distance not present but in redzone + # Detect scoring events from status detail + status_detail = status["type"].get("detail", "").lower() + status_short = status["type"].get("shortDetail", "").lower() + + # Check for scoring events in status text + if any(keyword in status_detail for keyword in ["touchdown", "td"]): + scoring_event = "TOUCHDOWN" + elif any(keyword in status_detail for keyword in ["field goal", "fg"]): + scoring_event = "FIELD GOAL" + elif any(keyword in status_detail for keyword in ["extra point", "pat", "point after"]): + scoring_event = "PAT" + elif any(keyword in status_short for keyword in ["touchdown", "td"]): + scoring_event = "TOUCHDOWN" + elif any(keyword in status_short for keyword in ["field goal", "fg"]): + scoring_event = "FIELD GOAL" + elif any(keyword in status_short for keyword in ["extra point", "pat"]): + scoring_event = "PAT" + # Determine possession based on team ID possession_team_id = situation.get("possession") if possession_team_id: @@ -421,6 +443,7 @@ class BaseNFLManager: # Renamed class "down_distance_text": down_distance_text, # Added Down/Distance "possession": situation.get("possession") if situation else None, # ID of team with possession "possession_indicator": possession_indicator, # Added for easy home/away check + "scoring_event": scoring_event, # Track scoring events (TOUCHDOWN, FIELD GOAL, PAT) } # Basic validation (can be expanded) @@ -713,9 +736,29 @@ class NFLLiveManager(BaseNFLManager): # Renamed class status_y = 1 # Position at top self._draw_text_with_outline(draw_overlay, period_clock_text, (status_x, status_y), self.fonts['time']) - # Down & Distance (Below Period/Clock) + # Down & Distance or Scoring Event (Below Period/Clock) + scoring_event = game.get("scoring_event", "") down_distance = game.get("down_distance_text", "") - if down_distance and game.get("is_live"): # Only show if live and available + + # Show scoring event if detected, otherwise show down & distance + if scoring_event and game.get("is_live"): + # Display scoring event with special formatting + event_width = draw_overlay.textlength(scoring_event, font=self.fonts['detail']) + event_x = (self.display_width - event_width) // 2 + event_y = (self.display_height) - 7 + + # Color coding for different scoring events + if scoring_event == "TOUCHDOWN": + event_color = (255, 215, 0) # Gold + elif scoring_event == "FIELD GOAL": + event_color = (0, 255, 0) # Green + elif scoring_event == "PAT": + event_color = (255, 165, 0) # Orange + else: + event_color = (255, 255, 255) # White + + self._draw_text_with_outline(draw_overlay, scoring_event, (event_x, event_y), self.fonts['detail'], fill=event_color) + elif down_distance and game.get("is_live"): # Only show if live and available dd_width = draw_overlay.textlength(down_distance, font=self.fonts['detail']) dd_x = (self.display_width - dd_width) // 2 dd_y = (self.display_height)- 7 # Top of D&D text @@ -850,18 +893,32 @@ class NFLRecentManager(BaseNFLManager): # Renamed class # Filter for favorite teams only if the config is set if self.nfl_config.get("show_favorite_teams_only", False): - team_games = [game for game in processed_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in processed_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the most recent + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=self._get_timezone()), reverse=True) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=self._get_timezone()), reverse=True) else: team_games = processed_games # Show all recent games if no favorites defined - - # Sort by game time, most recent first - team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=self._get_timezone()), reverse=True) - - # Limit to the specified number of recent games (default 5) - recent_games_to_show = self.nfl_config.get("recent_games_to_show", 5) - team_games = team_games[:recent_games_to_show] + # Sort by game time, most recent first + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=self._get_timezone()), reverse=True) + # Limit to the specified number of recent games (default 5) + recent_games_to_show = self.nfl_config.get("recent_games_to_show", 5) + team_games = team_games[:recent_games_to_show] # Check if the list of games to display has changed new_game_ids = {g['id'] for g in team_games} @@ -1075,20 +1132,34 @@ class NFLUpcomingManager(BaseNFLManager): # Renamed class # This check is now partially redundant if show_favorite_teams_only is true, but acts as the main filter otherwise if self.nfl_config.get("show_favorite_teams_only", False): - team_games = [game for game in processed_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in processed_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the earliest + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=self._get_timezone())) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=self._get_timezone())) else: team_games = processed_games # Show all upcoming if no favorites - - # Sort by game time, earliest first - team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=self._get_timezone())) - - # Limit to the specified number of upcoming games (default 10) - upcoming_games_to_show = self.nfl_config.get("upcoming_games_to_show", 10) - self.logger.debug(f"[NFL Upcoming] Limiting to {upcoming_games_to_show} games (found {len(team_games)} total)") - team_games = team_games[:upcoming_games_to_show] - self.logger.debug(f"[NFL Upcoming] After limiting: {len(team_games)} games") + # Sort by game time, earliest first + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=self._get_timezone())) + # Limit to the specified number of upcoming games (default 10) + upcoming_games_to_show = self.nfl_config.get("upcoming_games_to_show", 10) + self.logger.debug(f"[NFL Upcoming] Limiting to {upcoming_games_to_show} games (found {len(team_games)} total)") + team_games = team_games[:upcoming_games_to_show] + self.logger.debug(f"[NFL Upcoming] After limiting: {len(team_games)} games") # Log changes or periodically should_log = ( diff --git a/src/nhl_managers.py b/src/nhl_managers.py index b281abe0..0f6f4953 100644 --- a/src/nhl_managers.py +++ b/src/nhl_managers.py @@ -700,15 +700,30 @@ class NHLRecentManager(BaseNHLManager): # Filter for favorite teams only if the config is set if self.nhl_config.get("show_favorite_teams_only", False): - team_games = [game for game in processed_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in processed_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the most recent + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) else: team_games = processed_games - - # Sort games by start time, most recent first, then limit to recent_games_to_show - team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) - team_games = team_games[:self.recent_games_to_show] + # Sort games by start time, most recent first, then limit to recent_games_to_show + team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.min.replace(tzinfo=timezone.utc), reverse=True) + team_games = team_games[:self.recent_games_to_show] self.logger.info(f"[NHL] Found {len(team_games)} recent games for favorite teams (limited to {self.recent_games_to_show})") @@ -805,15 +820,30 @@ class NHLUpcomingManager(BaseNHLManager): # Filter for favorite teams only if the config is set if self.nhl_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_upcoming_games - if game['home_abbr'] in self.favorite_teams or - game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_upcoming_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the earliest + team_specific_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda g: g.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) else: team_games = new_upcoming_games - - # Sort games by start time, soonest first, then limit to configured count - team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) - team_games = team_games[:self.upcoming_games_to_show] + # Sort games by start time, soonest first, then limit to configured count + team_games.sort(key=lambda x: x.get('start_time_utc') or datetime.max.replace(tzinfo=timezone.utc)) + team_games = team_games[:self.upcoming_games_to_show] # Only log if there's a change in games or enough time has passed should_log = ( diff --git a/src/odds_manager.py b/src/odds_manager.py index 7b11b6b5..705d60f6 100644 --- a/src/odds_manager.py +++ b/src/odds_manager.py @@ -35,7 +35,17 @@ class OddsManager: self.logger.info(f"Cache miss - fetching fresh odds from ESPN for {cache_key}") try: - url = f"{self.base_url}/{sport}/leagues/{league}/events/{event_id}/competitions/{event_id}/odds" + # Map league names to ESPN API format + league_mapping = { + 'ncaa_fb': 'college-football', + 'nfl': 'nfl', + 'nba': 'nba', + 'mlb': 'mlb', + 'nhl': 'nhl' + } + + espn_league = league_mapping.get(league, league) + url = f"{self.base_url}/{sport}/leagues/{espn_league}/events/{event_id}/competitions/{event_id}/odds" self.logger.info(f"Requesting odds from URL: {url}") response = requests.get(url, timeout=10) response.raise_for_status() @@ -46,13 +56,16 @@ class OddsManager: self.logger.debug(f"Received raw odds data from ESPN: {json.dumps(raw_data, indent=2)}") odds_data = self._extract_espn_data(raw_data) - self.logger.info(f"Extracted odds data: {odds_data}") + if odds_data: + self.logger.info(f"Successfully extracted odds data: {odds_data}") + else: + self.logger.debug("No odds data available for this game") if odds_data: self.cache_manager.set(cache_key, odds_data) self.logger.info(f"Saved odds data to cache for {cache_key}") else: - self.logger.warning(f"No odds data extracted for {cache_key}") + self.logger.debug(f"No odds data available for {cache_key}") # Cache the fact that no odds are available to avoid repeated API calls self.cache_manager.set(cache_key, {"no_odds": True}) @@ -91,7 +104,13 @@ class OddsManager: self.logger.debug(f"Returning extracted odds data: {json.dumps(extracted_data, indent=2)}") return extracted_data - # Log the actual response structure when no items are found - self.logger.warning("No 'items' found in ESPN odds data.") - self.logger.warning(f"Actual response structure: {json.dumps(data, indent=2)}") - return None \ No newline at end of file + # Check if this is a valid empty response or an unexpected structure + if "count" in data and data["count"] == 0 and "items" in data and data["items"] == []: + # This is a valid empty response - no odds available for this game + self.logger.debug(f"No odds available for this game. Response: {json.dumps(data, indent=2)}") + return None + else: + # This is an unexpected response structure + self.logger.warning("No 'items' found in ESPN odds data.") + self.logger.warning(f"Unexpected response structure: {json.dumps(data, indent=2)}") + return None \ No newline at end of file diff --git a/src/odds_ticker_manager.py b/src/odds_ticker_manager.py index fd2e7832..4b4bc22c 100644 --- a/src/odds_ticker_manager.py +++ b/src/odds_ticker_manager.py @@ -119,6 +119,7 @@ class OddsTickerManager: self.current_game_index = 0 self.ticker_image = None # This will hold the single, wide image self.last_display_time = 0 + self._end_reached_logged = False # Track if we've already logged reaching the end # Font setup self.fonts = self._load_fonts() @@ -795,9 +796,16 @@ class OddsTickerManager: elif sport == 'football': quarter_text = f"Q{live_info.get('quarter', 1)}" - down_text = f"{live_info.get('down', 0)}&{live_info.get('distance', 0)}" + # Validate down and distance for odds ticker display + down = live_info.get('down') + distance = live_info.get('distance') + if (down is not None and isinstance(down, int) and 1 <= down <= 4 and + distance is not None and isinstance(distance, int) and distance >= 0): + down_text = f"{down}&{distance}" + else: + down_text = "" # Don't show invalid down/distance clock_text = live_info.get('clock', '') - return f"[LIVE] {away_team_name} {away_score} vs {home_team_name} {home_score} - {quarter_text} {down_text} {clock_text}" + return f"[LIVE] {away_team_name} {away_score} vs {home_team_name} {home_score} - {quarter_text} {down_text} {clock_text}".strip() elif sport == 'basketball': quarter_text = f"Q{live_info.get('quarter', 1)}" @@ -1106,7 +1114,14 @@ class OddsTickerManager: elif sport == 'football': # Football: Show quarter and down/distance quarter_text = f"Q{live_info.get('quarter', 1)}" - down_text = f"{live_info.get('down', 0)}&{live_info.get('distance', 0)}" + # Validate down and distance for odds ticker display + down = live_info.get('down') + distance = live_info.get('distance') + if (down is not None and isinstance(down, int) and 1 <= down <= 4 and + distance is not None and isinstance(distance, int) and distance >= 0): + down_text = f"{down}&{distance}" + else: + down_text = "" # Don't show invalid down/distance clock_text = live_info.get('clock', '') day_text = quarter_text @@ -1476,9 +1491,9 @@ class OddsTickerManager: return gap_width = 24 # Reduced gap between games - display_width = self.display_manager.matrix.width # Add display width of black space at start + display_width = self.display_manager.matrix.width # Add display width of black space at start and end content_width = sum(img.width for img in game_images) + gap_width * (len(game_images)) - total_width = display_width + content_width + total_width = display_width + content_width + display_width # Add display width at both start and end height = self.display_manager.matrix.height logger.debug(f"Image creation details:") @@ -1504,7 +1519,7 @@ class OddsTickerManager: # Calculate total scroll width for dynamic duration (only the content width, not including display width) self.total_scroll_width = content_width logger.debug(f"Odds ticker image creation:") - logger.debug(f" Display width: {display_width}px") + logger.debug(f" Display width: {display_width}px (added at start and end)") logger.debug(f" Content width: {content_width}px") logger.debug(f" Total image width: {total_width}px") logger.debug(f" Number of games: {len(game_images)}") @@ -1701,6 +1716,8 @@ class OddsTickerManager: logger.debug(f"Reset/initialized display start time: {self._display_start_time}") # Also reset scroll position for clean start self.scroll_position = 0 + # Reset the end reached logging flag + self._end_reached_logged = False else: # Check if the display start time is too old (more than 2x the dynamic duration) current_time = time.time() @@ -1709,6 +1726,8 @@ class OddsTickerManager: logger.debug(f"Display start time is too old ({elapsed_time:.1f}s), resetting") self._display_start_time = current_time self.scroll_position = 0 + # Reset the end reached logging flag + self._end_reached_logged = False logger.debug(f"Number of games in data at start of display method: {len(self.games_data)}") if not self.games_data: @@ -1812,11 +1831,13 @@ class OddsTickerManager: else: # Stop scrolling when we reach the end if self.scroll_position >= self.ticker_image.width - width: - logger.info(f"Odds ticker reached end: scroll_position {self.scroll_position} >= {self.ticker_image.width - width}") + if not self._end_reached_logged: + logger.info(f"Odds ticker reached end: scroll_position {self.scroll_position} >= {self.ticker_image.width - width}") + logger.info("Odds ticker scrolling stopped - reached end of content") + self._end_reached_logged = True self.scroll_position = self.ticker_image.width - width # Signal that scrolling has stopped self.display_manager.set_scrolling_state(False) - logger.info("Odds ticker scrolling stopped - reached end of content") # Check if we're at a natural break point for mode switching # If we're near the end of the display duration and not at a clean break point, diff --git a/src/of_the_day_manager.py b/src/of_the_day_manager.py index ee5ad12a..a72a9300 100644 --- a/src/of_the_day_manager.py +++ b/src/of_the_day_manager.py @@ -5,7 +5,10 @@ from datetime import date from PIL import ImageDraw, ImageFont from src.config_manager import ConfigManager import time -import freetype +try: + import freetype +except ImportError: + freetype = None # Configure logger for this module logger = logging.getLogger(__name__) @@ -36,17 +39,56 @@ class OfTheDayManager: # Load fonts with robust path resolution and fallbacks try: + # Try multiple font directory locations script_dir = os.path.dirname(os.path.abspath(__file__)) - font_dir = os.path.abspath(os.path.join(script_dir, '..', 'assets', 'fonts')) + possible_font_dirs = [ + os.path.abspath(os.path.join(script_dir, '..', 'assets', 'fonts')), # Relative to src/ + os.path.abspath(os.path.join(os.getcwd(), 'assets', 'fonts')), # Relative to project root + os.path.abspath('assets/fonts'), # Simple relative path made absolute + 'assets/fonts' # Simple relative path + ] + + font_dir = None + for potential_dir in possible_font_dirs: + if os.path.exists(potential_dir): + font_dir = potential_dir + logger.debug(f"Found font directory at: {font_dir}") + break + + if font_dir is None: + logger.warning("No font directory found, using fallback fonts") + raise FileNotFoundError("Font directory not found") def _safe_load_bdf_font(filename): try: - font_path = os.path.abspath(os.path.join(font_dir, filename)) - if not os.path.exists(font_path): - raise FileNotFoundError(f"Font file not found: {font_path}") - return freetype.Face(font_path) + # Try multiple font paths + font_paths = [ + os.path.abspath(os.path.join(font_dir, filename)), + os.path.join(font_dir, filename), + os.path.join(script_dir, '..', 'assets', 'fonts', filename), + os.path.join(script_dir, '..', 'assets', 'fonts', filename) + ] + + for font_path in font_paths: + abs_font_path = os.path.abspath(font_path) + if os.path.exists(abs_font_path): + logger.debug(f"Loading BDF font: {abs_font_path}") + if freetype is not None: + return freetype.Face(abs_font_path) + else: + logger.warning("freetype module not available, cannot load BDF fonts") + return None + + logger.debug(f"Font file not found: {filename}") + # List available fonts for debugging + try: + available_fonts = [f for f in os.listdir(font_dir) if f.endswith('.bdf')] + logger.debug(f"Available BDF fonts in {font_dir}: {available_fonts}") + except: + pass + return None except Exception as e: - logger.error(f"Failed to load BDF font '{filename}': {e}") + logger.debug(f"Failed to load BDF font '{filename}': {e}") return None self.title_font = _safe_load_bdf_font('ic8x8u.bdf') @@ -55,19 +97,19 @@ class OfTheDayManager: # Fallbacks if BDF fonts aren't available if self.title_font is None: self.title_font = getattr(self.display_manager, 'bdf_5x7_font', None) or getattr(self.display_manager, 'small_font', ImageFont.load_default()) - logger.warning("Using fallback font for title in OfTheDayManager") + logger.info("Using fallback font for title in OfTheDayManager") if self.body_font is None: self.body_font = getattr(self.display_manager, 'bdf_5x7_font', None) or getattr(self.display_manager, 'small_font', ImageFont.load_default()) - logger.warning("Using fallback font for body in OfTheDayManager") + logger.info("Using fallback font for body in OfTheDayManager") # Log font types for debugging logger.debug(f"Title font type: {type(self.title_font).__name__}") logger.debug(f"Body font type: {type(self.body_font).__name__}") except Exception as e: - logger.error(f"Unexpected error during font initialization: {e}") + logger.warning(f"Error during font initialization, using fallbacks: {e}") # Last-resort fallback - self.title_font = ImageFont.load_default() - self.body_font = ImageFont.load_default() + self.title_font = getattr(self.display_manager, 'small_font', ImageFont.load_default()) + self.body_font = getattr(self.display_manager, 'small_font', ImageFont.load_default()) # Load categories and their data self.categories = self.of_the_day_config.get('categories', {}) @@ -107,6 +149,16 @@ class OfTheDayManager: logger.info(f"Loading data files for {len(self.categories)} categories") logger.info(f"Current working directory: {os.getcwd()}") logger.info(f"Script directory: {os.path.dirname(__file__)}") + + # Additional debugging for Pi environment + logger.debug(f"Absolute script directory: {os.path.abspath(os.path.dirname(__file__))}") + logger.debug(f"Absolute working directory: {os.path.abspath(os.getcwd())}") + + # Check if we're running on Pi + if os.path.exists('/home/ledpi'): + logger.debug("Detected Pi environment (/home/ledpi exists)") + else: + logger.debug("Not running on Pi environment") for category_name, category_config in self.categories.items(): logger.debug(f"Processing category: {category_name}") @@ -120,17 +172,95 @@ class OfTheDayManager: continue try: - # Try relative path first, then absolute - file_path = data_file - if not os.path.isabs(file_path): - # If data_file already contains 'of_the_day/', use it as is - if data_file.startswith('of_the_day/'): - file_path = os.path.join(os.path.dirname(__file__), '..', data_file) - else: - file_path = os.path.join(os.path.dirname(__file__), '..', 'of_the_day', data_file) + # Try multiple possible paths for data files + script_dir = os.path.dirname(os.path.abspath(__file__)) + current_dir = os.getcwd() + project_root = os.path.dirname(script_dir) # Go up one level from src/ to project root + possible_paths = [] + + logger.debug(f"Script directory: {script_dir}") + logger.debug(f"Current working directory: {current_dir}") + logger.debug(f"Project root directory: {project_root}") + logger.debug(f"Data file from config: {data_file}") + + if os.path.isabs(data_file): + possible_paths.append(data_file) + else: + # Always try multiple paths regardless of how data_file is specified + possible_paths.extend([ + os.path.join(current_dir, data_file), # Current working directory first + os.path.join(project_root, data_file), # Project root directory + os.path.join(script_dir, '..', data_file), # Relative to script directory + data_file # Direct path + ]) + + # If data_file doesn't already contain 'of_the_day/', also try with it + if not data_file.startswith('of_the_day/'): + possible_paths.extend([ + os.path.join(current_dir, 'of_the_day', os.path.basename(data_file)), + os.path.join(project_root, 'of_the_day', os.path.basename(data_file)), + os.path.join(script_dir, '..', 'of_the_day', os.path.basename(data_file)), + os.path.join('of_the_day', os.path.basename(data_file)) + ]) + else: + # If data_file already contains 'of_the_day/', try extracting just the filename + filename = os.path.basename(data_file) + possible_paths.extend([ + os.path.join(current_dir, 'of_the_day', filename), + os.path.join(project_root, 'of_the_day', filename), + os.path.join(script_dir, '..', 'of_the_day', filename), + os.path.join('of_the_day', filename) + ]) + + # Debug: Show all paths before deduplication + logger.debug(f"All possible paths before deduplication: {possible_paths}") + + # Remove duplicates while preserving order + seen = set() + unique_paths = [] + for path in possible_paths: + abs_path = os.path.abspath(path) + if abs_path not in seen: + seen.add(abs_path) + unique_paths.append(abs_path) + possible_paths = unique_paths + + # Debug: Show paths after deduplication + logger.debug(f"Unique paths after deduplication: {possible_paths}") + + file_path = None + for potential_path in possible_paths: + abs_path = os.path.abspath(potential_path) + if os.path.exists(abs_path): + file_path = abs_path + logger.debug(f"Found data file for {category_name} at: {file_path}") + break + + # Final fallback - try the direct path relative to current working directory + if file_path is None: + direct_path = os.path.join(current_dir, 'of_the_day', os.path.basename(data_file)) + if os.path.exists(direct_path): + file_path = direct_path + logger.debug(f"Found data file for {category_name} using direct fallback: {file_path}") + + if file_path is None: + # Use the first attempted path for error reporting + file_path = os.path.abspath(possible_paths[0]) + logger.debug(f"No data file found for {category_name}, tried: {[os.path.abspath(p) for p in possible_paths]}") + + # Additional debugging - check if parent directory exists + parent_dir = os.path.dirname(file_path) + logger.debug(f"Parent directory: {parent_dir}") + logger.debug(f"Parent directory exists: {os.path.exists(parent_dir)}") + if os.path.exists(parent_dir): + try: + parent_contents = os.listdir(parent_dir) + logger.debug(f"Parent directory contents: {parent_contents}") + except PermissionError: + logger.debug(f"Permission denied accessing parent directory: {parent_dir}") + except Exception as e: + logger.debug(f"Error listing parent directory: {e}") - # Convert to absolute path for better logging - file_path = os.path.abspath(file_path) logger.debug(f"Attempting to load {category_name} from: {file_path}") if os.path.exists(file_path): @@ -156,7 +286,18 @@ class OfTheDayManager: else: logger.error(f"Data file not found for {category_name}: {file_path}") - logger.error(f"Directory contents: {os.listdir(os.path.dirname(file_path)) if os.path.exists(os.path.dirname(file_path)) else 'Parent directory does not exist'}") + parent_dir = os.path.dirname(file_path) + if os.path.exists(parent_dir): + try: + dir_contents = os.listdir(parent_dir) + logger.error(f"Directory contents of {parent_dir}: {dir_contents}") + except PermissionError: + logger.error(f"Permission denied accessing directory: {parent_dir}") + except Exception as e: + logger.error(f"Error listing directory {parent_dir}: {e}") + else: + logger.error(f"Parent directory does not exist: {parent_dir}") + logger.error(f"Tried paths: {[os.path.abspath(p) for p in possible_paths]}") self.data_files[category_name] = {} except json.JSONDecodeError as e: @@ -240,15 +381,26 @@ class OfTheDayManager: """Draw text for both BDF (FreeType Face) and PIL TTF fonts.""" try: # If we have a PIL font, use native text rendering - if not isinstance(face, freetype.Face): + if freetype is None or not isinstance(face, freetype.Face): draw.text((x, y), text, fill=color, font=face) return + # Compute baseline from font ascender so caller can pass top-left y + try: + ascender_px = face.size.ascender >> 6 + except Exception: + ascender_px = 0 + baseline_y = y + ascender_px + # Otherwise, render BDF glyphs manually for char in text: face.load_char(char) bitmap = face.glyph.bitmap + # Get glyph metrics + glyph_left = face.glyph.bitmap_left + glyph_top = face.glyph.bitmap_top + for i in range(bitmap.rows): for j in range(bitmap.width): try: @@ -256,9 +408,12 @@ class OfTheDayManager: if byte_index < len(bitmap.buffer): byte = bitmap.buffer[byte_index] if byte & (1 << (7 - (j % 8))): - draw_y = y - face.glyph.bitmap_top + i - draw_x = x + face.glyph.bitmap_left + j - draw.point((draw_x, draw_y), fill=color) + # Calculate actual pixel position + pixel_x = x + glyph_left + j + pixel_y = baseline_y - glyph_top + i + # Only draw if within bounds + if (0 <= pixel_x < self.display_manager.width and 0 <= pixel_y < self.display_manager.height): + draw.point((pixel_x, pixel_y), fill=color) except IndexError: logger.warning(f"Index out of range for char '{char}' at position ({i}, {j})") continue @@ -287,10 +442,54 @@ class OfTheDayManager: except Exception: body_height = 8 - # --- Draw Title (always at top) --- - title_y = title_height # Position title so its bottom is at title_height + # --- Dynamic Spacing Calculation --- + # Calculate how much space we need and distribute it evenly + margin_top = 8 # Shift everything down by 6 pixels + margin_bottom = 1 + underline_space = 1 # Space for underline - # Calculate title width for centering (robust to font type) + # Determine current content + current_text = subtitle if (self.rotation_state == 0 and subtitle) else description + if not current_text: + current_text = "" + + # Pre-wrap the body text to determine how many lines we'll need + available_width = matrix_width - 4 # Leave some margin + wrapped_lines = self._wrap_text(current_text, available_width, body_font, max_lines=10, + line_height=body_height, max_height=matrix_height) + # Filter out empty lines for spacing calculation + actual_body_lines = [line for line in wrapped_lines if line.strip()] + num_body_lines = len(actual_body_lines) + + # Calculate total content height needed + title_content_height = title_height + underline_content_height = underline_space + body_content_height = num_body_lines * body_height if num_body_lines > 0 else 0 + + total_content_height = title_content_height + underline_content_height + body_content_height + available_space = matrix_height - margin_top - margin_bottom + + # Calculate dynamic spacing + if total_content_height < available_space: + # We have extra space - distribute it + extra_space = available_space - total_content_height + if num_body_lines > 0: + # Distribute space: 30% after title, 70% between body lines + space_after_title = max(2, int(extra_space * 0.3)) + space_between_lines = max(1, int(extra_space * 0.7 / max(1, num_body_lines - 1))) if num_body_lines > 1 else 0 + else: + # No body text - just center the title + space_after_title = extra_space // 2 + space_between_lines = 0 + else: + # Tight spacing + space_after_title = 4 + space_between_lines = 1 + + # --- Draw Title --- + title_y = margin_top + + # Calculate title width for centering try: title_width = self.display_manager.get_text_width(title, title_font) except Exception: @@ -300,48 +499,33 @@ class OfTheDayManager: title_x = (matrix_width - title_width) // 2 self._draw_bdf_text(draw, title_font, title, title_x, title_y, color=self.title_color) - # Underline below title (centered) - underline_y = title_height + 1 + # --- Draw Underline --- + underline_y = title_y + title_height + 1 # Reduced space after title underline_x_start = title_x underline_x_end = title_x + title_width draw.line([(underline_x_start, underline_y), (underline_x_end, underline_y)], fill=self.title_color, width=1) - # --- Draw Subtitle or Description (rotating) --- - # Start subtitle/description below the title and underline - # Account for title height + underline + spacing - y_start = title_height + body_height + 4 # Space for underline - available_height = matrix_height - y_start - available_width = matrix_width - 2 + # --- Draw Body Text with Dynamic Spacing --- + if num_body_lines > 0: + body_start_y = underline_y + space_after_title + 1 # Shift description down 1 pixel + current_y = body_start_y + + for i, line in enumerate(actual_body_lines): + if line.strip(): # Only draw non-empty lines + # Center each line of body text + try: + line_width = self.display_manager.get_text_width(line, body_font) + except Exception: + line_width = len(line) * 6 + line_x = (matrix_width - line_width) // 2 + + # Draw the line + self._draw_bdf_text(draw, body_font, line, line_x, current_y, color=self.subtitle_color) + + # Move to next line position + if i < len(actual_body_lines) - 1: # Not the last line + current_y += body_height + space_between_lines - if self.rotation_state == 0 and subtitle: - # Show subtitle - wrapped = self._wrap_text(subtitle, available_width, body_font, max_lines=3, line_height=body_height, max_height=available_height) - for i, line in enumerate(wrapped): - if line.strip(): # Only draw non-empty lines - # Center each line of body text - try: - line_width = self.display_manager.get_text_width(line, body_font) - except Exception: - line_width = len(line) * 6 - line_x = (matrix_width - line_width) // 2 - # Add one pixel buffer between lines - line_y = y_start + i * (body_height + 1) - self._draw_bdf_text(draw, body_font, line, line_x, line_y, color=self.subtitle_color) - elif self.rotation_state == 1 and description: - # Show description - wrapped = self._wrap_text(description, available_width, body_font, max_lines=3, line_height=body_height, max_height=available_height) - for i, line in enumerate(wrapped): - if line.strip(): # Only draw non-empty lines - # Center each line of body text - try: - line_width = self.display_manager.get_text_width(line, body_font) - except Exception: - line_width = len(line) * 6 - line_x = (matrix_width - line_width) // 2 - # Add one pixel buffer between lines - line_y = y_start + i * (body_height + 1) - self._draw_bdf_text(draw, body_font, line, line_x, line_y, color=self.subtitle_color) - # else: nothing to show return True except Exception as e: logger.error(f"Error drawing 'of the day' item: {e}", exc_info=True) diff --git a/src/soccer_managers.py b/src/soccer_managers.py index a0b27fc9..8ecbeed5 100644 --- a/src/soccer_managers.py +++ b/src/soccer_managers.py @@ -12,6 +12,7 @@ from src.display_manager import DisplayManager from src.cache_manager import CacheManager from src.config_manager import ConfigManager from src.odds_manager import OddsManager +from src.logo_downloader import download_missing_logo, get_soccer_league_key import pytz # Import the API counter function from web interface @@ -32,6 +33,7 @@ LEAGUE_SLUGS = { "ger.1": "Bundesliga", "ita.1": "Serie A", "fra.1": "Ligue 1", + "por.1": "Liga Portugal", "uefa.champions": "Champions League", "uefa.europa": "Europa League", "usa.1": "MLS", @@ -408,42 +410,61 @@ class BaseSoccerManager: try: if not os.path.exists(logo_path) and not (cache_logo_path and os.path.exists(cache_logo_path)): - self.logger.info(f"Creating placeholder logo for {team_abbrev}") - # Try to create placeholder in cache directory instead of assets directory - cache_logo_path = None - try: - # Use cache directory for placeholder logos - if hasattr(self.cache_manager, 'cache_dir') and self.cache_manager.cache_dir: - cache_logo_dir = os.path.join(self.cache_manager.cache_dir, 'placeholder_logos') - os.makedirs(cache_logo_dir, exist_ok=True) - cache_logo_path = os.path.join(cache_logo_dir, f"{team_abbrev}.png") + self.logger.info(f"Logo not found for {team_abbrev} at {logo_path}. Attempting to download from ESPN.") + + # Try to download the logo from ESPN API for each configured league + download_success = False + for league_code in self.target_leagues_config: + if league_code in LEAGUE_SLUGS: + soccer_league_key = get_soccer_league_key(league_code) + self.logger.debug(f"Attempting to download {team_abbrev} logo from {league_code} ({soccer_league_key})") - # Create placeholder logo + success = download_missing_logo(team_abbrev, soccer_league_key, team_abbrev) + if success: + self.logger.info(f"Successfully downloaded logo for {team_abbrev} from {league_code}") + download_success = True + break + else: + self.logger.debug(f"Failed to download {team_abbrev} logo from {league_code}") + + if not download_success: + self.logger.warning(f"Failed to download logo for {team_abbrev} from any configured league. Creating placeholder.") + # Try to create placeholder in cache directory instead of assets directory + cache_logo_path = None + try: + # Use cache directory for placeholder logos + if hasattr(self.cache_manager, 'cache_dir') and self.cache_manager.cache_dir: + cache_logo_dir = os.path.join(self.cache_manager.cache_dir, 'placeholder_logos') + os.makedirs(cache_logo_dir, exist_ok=True) + cache_logo_path = os.path.join(cache_logo_dir, f"{team_abbrev}.png") + + # Create placeholder logo + logo = Image.new('RGBA', (36, 36), (random.randint(50, 200), random.randint(50, 200), random.randint(50, 200), 255)) + draw = ImageDraw.Draw(logo) + # Optionally add text to placeholder + try: + script_dir = os.path.dirname(os.path.abspath(__file__)) + font_4x6 = os.path.abspath(os.path.join(script_dir, "../assets/fonts/4x6-font.ttf")) + placeholder_font = ImageFont.truetype(font_4x6, 12) + text_width = draw.textlength(team_abbrev, font=placeholder_font) + text_x = (36 - text_width) // 2 + text_y = 10 + draw.text((text_x, text_y), team_abbrev, fill=(0,0,0,255), font=placeholder_font) + except IOError: + pass # Font not found, skip text + logo.save(cache_logo_path) + self.logger.info(f"Created placeholder logo in cache at {cache_logo_path}") + # Update logo_path to use cache version + logo_path = cache_logo_path + else: + # No cache directory available, just use in-memory placeholder + raise PermissionError("No writable cache directory available") + except (PermissionError, OSError) as pe: + self.logger.debug(f"Could not create placeholder logo file for {team_abbrev}: {pe}") + # Return a simple in-memory placeholder instead logo = Image.new('RGBA', (36, 36), (random.randint(50, 200), random.randint(50, 200), random.randint(50, 200), 255)) - draw = ImageDraw.Draw(logo) - # Optionally add text to placeholder - try: - font_4x6 = os.path.abspath(os.path.join(script_dir, "../assets/fonts/4x6-font.ttf")) - placeholder_font = ImageFont.truetype(font_4x6, 12) - text_width = draw.textlength(team_abbrev, font=placeholder_font) - text_x = (36 - text_width) // 2 - text_y = 10 - draw.text((text_x, text_y), team_abbrev, fill=(0,0,0,255), font=placeholder_font) - except IOError: - pass # Font not found, skip text - logo.save(cache_logo_path) - self.logger.info(f"Created placeholder logo in cache at {cache_logo_path}") - # Update logo_path to use cache version - logo_path = cache_logo_path - else: - # No cache directory available, just use in-memory placeholder - raise PermissionError("No writable cache directory available") - except (PermissionError, OSError) as pe: - self.logger.debug(f"Could not create placeholder logo file for {team_abbrev}: {pe}") - # Return a simple in-memory placeholder instead - logo = Image.new('RGBA', (36, 36), (random.randint(50, 200), random.randint(50, 200), random.randint(50, 200), 255)) - self._logo_cache[team_abbrev] = logo - return logo + self._logo_cache[team_abbrev] = logo + return logo # Try to load logo from original path or cache directory logo_to_load = None @@ -971,13 +992,30 @@ class SoccerRecentManager(BaseSoccerManager): # Filter for favorite teams only if the config is set if self.soccer_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_recent_games if game['home_abbr'] in self.favorite_teams or game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_recent_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (most recent game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the most recent + team_specific_games.sort(key=lambda g: g['start_time_utc'], reverse=True) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time (most recent first) + team_games.sort(key=lambda g: g['start_time_utc'], reverse=True) else: team_games = new_recent_games - - # Sort games by start time, most recent first, and limit to recent_games_to_show - team_games.sort(key=lambda x: x['start_time_utc'], reverse=True) - team_games = team_games[:self.recent_games_to_show] + # Sort games by start time, most recent first, and limit to recent_games_to_show + team_games.sort(key=lambda x: x['start_time_utc'], reverse=True) + team_games = team_games[:self.recent_games_to_show] # Update only if the list content changes new_ids = {g['id'] for g in team_games} @@ -1078,13 +1116,30 @@ class SoccerUpcomingManager(BaseSoccerManager): # Filter for favorite teams only if the config is set if self.soccer_config.get("show_favorite_teams_only", False): - team_games = [game for game in new_upcoming_games if game['home_abbr'] in self.favorite_teams or game['away_abbr'] in self.favorite_teams] + # Get all games involving favorite teams + favorite_team_games = [game for game in new_upcoming_games + if game['home_abbr'] in self.favorite_teams or + game['away_abbr'] in self.favorite_teams] + + # Select one game per favorite team (earliest upcoming game for each team) + team_games = [] + for team in self.favorite_teams: + # Find games where this team is playing + team_specific_games = [game for game in favorite_team_games + if game['home_abbr'] == team or game['away_abbr'] == team] + + if team_specific_games: + # Sort by game time and take the earliest + team_specific_games.sort(key=lambda g: g['start_time_utc']) + team_games.append(team_specific_games[0]) + + # Sort the final list by game time + team_games.sort(key=lambda g: g['start_time_utc']) else: team_games = new_upcoming_games - - # Sort games by start time, soonest first, then limit to configured count - team_games.sort(key=lambda x: x['start_time_utc']) - team_games = team_games[:self.upcoming_games_to_show] + # Sort games by start time, soonest first, then limit to configured count + team_games.sort(key=lambda x: x['start_time_utc']) + team_games = team_games[:self.upcoming_games_to_show] # Update only if the list content changes new_ids = {g['id'] for g in team_games} diff --git a/templates/index_v2.html b/templates/index_v2.html index 92a62766..cf1df649 100644 --- a/templates/index_v2.html +++ b/templates/index_v2.html @@ -719,11 +719,12 @@ + On-Demand: None -
Service actions may require sudo privileges on the Pi.
+
Service actions may require sudo privileges on the Pi. Migrate Config adds new options with defaults while preserving your settings.
@@ -876,11 +877,11 @@
CPU Temperature
-
{{ main_config.display.hardware.brightness }}
+
{{ main_config.get('display', {}).get('hardware', {}).get('brightness', 0) }}
Brightness
-
{{ main_config.display.hardware.cols }}x{{ main_config.display.hardware.rows }}
+
{{ main_config.get('display', {}).get('hardware', {}).get('cols', 0) }}x{{ main_config.get('display', {}).get('hardware', {}).get('rows', 0) }}
Resolution
@@ -906,6 +907,9 @@ + @@ -919,28 +923,28 @@
Start the web interface on boot for easier access.
- +
IANA timezone, affects time-based features and scheduling.
- +
- +
- +
@@ -988,36 +992,36 @@
- +
Number of LED rows
- +
Number of LED columns
- +
Number of LED panels chained together
- +
Number of parallel chains
- -
LED brightness: {{ main_config.display.hardware.brightness }}%
+ +
LED brightness: {{ safe_config_get(main_config, 'display', 'hardware', 'brightness', default=95) }}%
Hardware mapping type
@@ -1025,32 +1029,32 @@
- +
GPIO slowdown factor (0-5)
- +
Scan mode for LED matrix (0-1)
- +
PWM bits for brightness control (1-11)
- +
PWM dither bits (0-4)
- +
PWM LSB nanoseconds (50-500)
- +
Limit refresh rate in Hz (1-1000)
@@ -1059,28 +1063,28 @@
Disable hardware pulsing
Inverse color display
Show refresh rate on display
Use short date format for display
@@ -1099,18 +1103,18 @@
- +
Python strftime format. Example: %I:%M %p for 12-hour time.
- +
@@ -1124,7 +1128,7 @@

How long each screen is shown before switching. Values in seconds.

- {% for key, value in main_config.display.display_durations.items() %} + {% for key, value in main_config.get('display', {}).get('display_durations', {}).items() %}
@@ -1166,36 +1170,36 @@
- +
City name for weather data
- +
State/province name
Temperature units
- +
Use tokens like {temp}, {condition}. Supports new lines.
- +
How often to update weather data (300-3600 seconds)
@@ -1215,42 +1219,42 @@
- +
Comma-separated stock symbols
- +
How often to update stock data
- +
Horizontal scroll pixels per step.
- +
Delay between scroll steps.
Display mini charts alongside stock ticker data
Adjust display duration based on content length.
@@ -1258,20 +1262,20 @@
- +
- +
- +
- +
Use tokens like {symbol}, {price}, {change}.
@@ -1281,18 +1285,18 @@
- +
Comma-separated crypto symbols (e.g., BTC-USD, ETH-USD)
- +
How often to update crypto data
@@ -1312,44 +1316,44 @@
- +
- +
- +
- +
- +
-
-
-
+
+
+
@@ -1369,45 +1373,45 @@
-
-
-
+
+
+
-
-
-
+
+
+
- +
Comma-separated list, e.g., nfl, mlb, ncaa_fb, milb
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
@@ -1427,126 +1431,126 @@
- +
- +
- +
- +
- +
- +
- +
- +

Enabled Sports

- +
- +
- +
- +
- +
- +
@@ -1565,18 +1569,18 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
@@ -1607,27 +1611,27 @@
- +
- +
- +
- +
Comma-separated list of category keys in display order
@@ -1636,17 +1640,17 @@
Word of the Day
- +
- +
@@ -1654,17 +1658,17 @@
Slovenian Word of the Day
- +
- +
@@ -1680,26 +1684,26 @@
Primary music source to display
- +
URL for YouTube Music companion app
- +
How often to check for music updates
@@ -1717,8 +1721,8 @@
-
-
+
+
@@ -1736,23 +1740,23 @@
- +
Maximum number of events to display
- +
How often to update calendar data
- +
Comma-separated calendar names
@@ -1822,24 +1826,24 @@

Advanced Settings

-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -2033,7 +2037,7 @@
- +