Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
340 changes: 340 additions & 0 deletions colors/teams.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,346 @@
"b": 255
}
},
"aus": {
"home": {
"r": 2,
"g": 70,
"b": 56
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 255,
"g": 184,
"b": 28
}
},
"bra": {
"home": {
"r": 254,
"g": 221,
"b": 0
},
"text": {
"r": 0,
"g": 39,
"b": 118
},
"accent": {
"r": 0,
"g": 156,
"b": 59
}
},
"can": {
"home": {
"r": 222,
"g": 41,
"b": 16
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 255,
"g": 255,
"b": 255
}
},
"tpe": {
"home": {
"r": 222,
"g": 41,
"b": 16
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 0,
"g": 56,
"b": 147
}
},
"cba": {
"home": {
"r": 255,
"g": 209,
"b": 0
},
"text": {
"r": 0,
"g": 56,
"b": 168
},
"accent": {
"r": 218,
"g": 41,
"b": 28
}
},
"cub": {
"home": {
"r": 211,
"g": 10,
"b": 40
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 0,
"g": 82,
"b": 147
}
},
"cze": {
"home": {
"r": 0,
"g": 33,
"b": 71
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 206,
"g": 17,
"b": 38
}
},
"dr": {
"home": {
"r": 206,
"g": 17,
"b": 38
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 0,
"g": 40,
"b": 104
}
},
"gbr": {
"home": {
"r": 1,
"g": 33,
"b": 105
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 200,
"g": 16,
"b": 46
}
},
"isr": {
"home": {
"r": 0,
"g": 56,
"b": 168
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 141,
"g": 144,
"b": 147
}
},
"ita": {
"home": {
"r": 255,
"g": 255,
"b": 255
},
"text": {
"r": 205,
"g": 33,
"b": 42
},
"accent": {
"r": 0,
"g": 140,
"b": 69
}
},
"jpn": {
"home": {
"r": 255,
"g": 255,
"b": 255
},
"text": {
"r": 188,
"g": 0,
"b": 20
},
"accent": {
"r": 255,
"g": 255,
"b": 255
}
},
"mex": {
"home": {
"r": 0,
"g": 104,
"b": 71
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 206,
"g": 17,
"b": 38
}
},
"nca": {
"home": {
"r": 0,
"g": 102,
"b": 204
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 255,
"g": 255,
"b": 255
}
},
"ned": {
"home": {
"r": 255,
"g": 96,
"b": 0
},
"accent": {
"r": 255,
"g": 255,
"b": 255
},
"text": {
"r": 0,
"g": 32,
"b": 91
}
},
"pan": {
"home": {
"r": 206,
"g": 17,
"b": 38
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 0,
"g": 40,
"b": 104
}
},
"pr": {
"home": {
"r": 207,
"g": 20,
"b": 43
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 0,
"g": 40,
"b": 104
}
},
"usa": {
"home": {
"r": 0,
"g": 34,
"b": 68
},
"text": {
"r": 255,
"g": 255,
"b": 255
},
"accent": {
"r": 206,
"g": 17,
"b": 38
}
},
"ven": {
"home": {
"r": 255,
"g": 223,
"b": 0
},
"text": {
"r": 0,
"g": 56,
"b": 168
},
"accent": {
"r": 206,
"g": 17,
"b": 38
}
},
"kor": {
"home": {
"r": 255,
"g": 255,
"b": 255
},
"text": {
"r": 0,
"g": 57,
"b": 166
},
"accent": {
"r": 213,
"g": 43,
"b": 30
}
},
"default": {
"home": {
"r": 7,
Expand Down
4 changes: 2 additions & 2 deletions data/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from data import status
from data.config.color import Color
from data.config.layout import Layout
from data.time_formats import TIME_FORMAT_12H, TIME_FORMAT_24H
from data.time_formats import TIME_FORMAT_12H, TIME_FORMAT_24H, os_datetime_format
from utils import deep_update

SCROLLING_SPEEDS = [0.3, 0.2, 0.1, 0.075, 0.05, 0.025, 0.01]
Expand Down Expand Up @@ -36,7 +36,7 @@ def __init__(self, filename_base, width, height):
self.news_ticker_mlb_news = json["news_ticker"]["mlb_news"]
self.news_ticker_countdowns = json["news_ticker"]["countdowns"]
self.news_ticker_date = json["news_ticker"]["date"]
self.news_ticker_date_format = json["news_ticker"]["date_format"]
self.news_ticker_date_format = os_datetime_format(json["news_ticker"]["date_format"])
self.news_no_games = json["news_ticker"]["display_no_games_live"]

# Display Standings
Expand Down
3 changes: 2 additions & 1 deletion data/schedule.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ def update(self, force=False) -> UpdateStatus:
debug.log("Updating schedule for %s", self.date)
self.starttime = time.time()
try:
self.__all_games = statsapi.schedule(self.date.strftime("%Y-%m-%d"))
# add sportId=51 to additionally get WBC games
self.__all_games = statsapi.schedule(self.date.strftime("%Y-%m-%d"), sportId="1,51")
except:
debug.exception("Networking error while refreshing schedule")
return UpdateStatus.FAIL
Expand Down
2 changes: 1 addition & 1 deletion data/standings.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def __should_update(self):
return time_delta >= STANDINGS_UPDATE_RATE

def populated(self):
return bool(self.standings) or (bool(self.leagues) and self.is_postseason())
return (bool(self.preferred_divisions) and bool(self.standings)) or (bool(self.leagues) and self.is_postseason())

def is_postseason(self):
return self.date > self.playoffs_start_date
Expand Down
Loading