diff --git a/api_caller.py b/api_caller.py index 4a28962..52ee793 100644 --- a/api_caller.py +++ b/api_caller.py @@ -344,6 +344,10 @@ def updateLeagueTable(api_key, league_id): league = 'premier_league' elif league_id == '4380': league = 'NHL' + elif league_id == '4387': + league = 'NBA' + elif league_id == '4391': + league = 'NFL' json.dump(premier_teams, open( "csv/sports/{}/team_stats.json".format(league), 'w+' )) @@ -366,6 +370,7 @@ def updateLeagueEvents(api_key, league_id, time): events = [] if not all_data['events'] is None: + for i in range(len(all_data['events'])): event = {} event['date'] = all_data['events'][i]['dateEvent'] @@ -384,11 +389,15 @@ def updateLeagueEvents(api_key, league_id, time): events.append(event) - + if league_id == '4328': league = 'premier_league' elif league_id == '4380': league = 'NHL' + elif league_id == '4387': + league = 'NBA' + elif league_id == '4391': + league = 'NFL' json.dump(events, open( "csv/sports/{}/{}_games.json".format(league, time), 'w+' )) @@ -400,11 +409,14 @@ def updateLeagueEvents(api_key, league_id, time): def updateSports(api_key): prem_id = '4328' #prem NHL_id = '4380' + NBA_id = '4387' #prem + NFL_id = '4391' + + for i in [NHL_id, NBA_id, NFL_id]: + updateLeagueEvents(api_key, i, 'live') + updateLeagueEvents(api_key, i, 'past') + updateLeagueEvents(api_key, i, 'future') - #updateLeagueTable(api_key, prem_id) #prem - updateLeagueEvents(api_key, prem_id, 'past') - updateLeagueEvents(api_key, NHL_id, 'future') - updateLeagueEvents(api_key, NHL_id, 'live') updateLeagueTable(api_key, NHL_id) updateLeagueTable(api_key, prem_id) diff --git a/csv/crypto.csv b/csv/crypto.csv index 1a2d60e..a02d997 100644 --- a/csv/crypto.csv +++ b/csv/crypto.csv @@ -1,3 +1,3 @@ symbol,name,base,current,24hr change -BTC,bitcoin,usd,35873,-5.21631039241079 -ETH,ethereum,gbp,1627.13,-3.8296511296684295 +BTC,bitcoin,usd,32687,-5.959078724239707 +ETH,ethereum,gbp,1419.67,-7.467260572537722 diff --git a/csv/current_weather.json b/csv/current_weather.json index 817c2a4..2d1a69e 100644 --- a/csv/current_weather.json +++ b/csv/current_weather.json @@ -1 +1 @@ -{"main_weather": "Clouds", "description": "overcast clouds", "temp": 31.85, "min_temp": 29.41, "max_temp": 33.03, "feels_like": 38.85, "humidity": 79, "clouds": 98, "wind_speed": 0.45, "wind_direction": 304, "visibility": 10000, "uv": 0.46, "rain_chance": 0.34} \ No newline at end of file +{"main_weather": "Clouds", "description": "overcast clouds", "temp": 29.9, "min_temp": 27.98, "max_temp": 30.74, "feels_like": 36.9, "humidity": 88, "clouds": 100, "wind_speed": 0.45, "wind_direction": 257, "visibility": 10000, "uv": 0, "rain_chance": 0.74} \ No newline at end of file diff --git a/csv/daily_weather.json b/csv/daily_weather.json index 776e8b3..f5e8157 100644 --- a/csv/daily_weather.json +++ b/csv/daily_weather.json @@ -1 +1 @@ -[{"main_weather": "Rain", "description": "moderate rain", "min_temp": 28.86, "max_temp": 31.53}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 28.73, "max_temp": 31.16}, {"main_weather": "Rain", "description": "light rain", "min_temp": 29.02, "max_temp": 31.15}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.67, "max_temp": 30.15}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.04, "max_temp": 28.48}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 26.22, "max_temp": 28.22}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.58, "max_temp": 28.65}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.9, "max_temp": 29.14}] \ No newline at end of file +[{"main_weather": "Rain", "description": "moderate rain", "min_temp": 28.51, "max_temp": 29.9}, {"main_weather": "Rain", "description": "very heavy rain", "min_temp": 25.39, "max_temp": 28.65}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.23, "max_temp": 27.86}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.08, "max_temp": 29.59}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.28, "max_temp": 30.13}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.33, "max_temp": 29.98}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.18, "max_temp": 28.89}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 26.62, "max_temp": 27.71}] \ No newline at end of file diff --git a/csv/last_update.csv b/csv/last_update.csv index 5eeec10..0c796ce 100644 --- a/csv/last_update.csv +++ b/csv/last_update.csv @@ -1 +1 @@ -19/06/2021 05:50:09 +21/06/2021 12:36:08 diff --git a/csv/news.csv b/csv/news.csv index 84d5ff4..8ddae88 100644 --- a/csv/news.csv +++ b/csv/news.csv @@ -1,21 +1,21 @@ headline,source,date,time -Hardliner Ebrahim Raisi hailed as Iran’s new president - The Guardian,The Guardian,2021-06-19,08:37:00Z -153 new COVID-19 deaths raise PH’s fatality count to 23^538 - INQUIRER.net,Inquirer.net,2021-06-19,08:20:00Z -Ebrahim Raisi^ ultra-conservative judiciary chief^ set to win Iran's presidential election - CNN ,CNN,2021-06-19,08:18:00Z -PUBG Mobile Lite vs Battlegrounds Mobile India (BGMI): 5 similarities between the famous battle royale titles - Sportskeeda,Sportskeeda,2021-06-19,08:14:19Z -Coronavirus News Live Updates: Centre asks states to ensure lockdown opening up is 'carefully calibrated';... - Moneycontrol,Moneycontrol,2021-06-19,08:10:04Z -Keep an eye out for rare electric-blue noctilucent clouds in the northern sky - CBC.ca,CBC News,2021-06-19,08:00:00Z -Why COVID-19 may now feel like a 'bad cold' — with headache^ runny nose among most-reported symptoms - CBC.ca,CBC News,2021-06-19,08:00:00Z -COVID-19 in Ottawa: Fast Facts for June 19^ 2021 - CTV Edmonton,Ctvnews.ca,2021-06-19,08:00:00Z -Young^ hot and bothered: ‘I was a 31-year-old newlywed – and then the menopause hit’ - The Guardian,The Guardian,2021-06-19,08:00:00Z -My Father Didn’t Die Of Covid-19^ But This Is How The Virus Killed Him Anyway - The Rakyat Post,The Rakyat Post,2021-06-19,08:00:00Z -Kathryn Thomas: 'We feel incredibly grateful to share this news'- Kathryn Thomas is pregnant with her second child - Independent.ie,Independent.ie,2021-06-19,07:50:00Z -Police dog Rambo killed while tracking suspect on Queensland highway - 9News,9News,2021-06-19,07:45:53Z -KMJS’ story on “The Woman Slashed on Her Face” named FINALIST at the 2021 NYF - GMA News,GMA News,2021-06-19,07:43:49Z -World Sickle Cell Day: Symptoms of Sickle Cell Disease in Teenagers^ Consequences Of Delayed Treatment - TheHealthSite,Thehealthsite.com,2021-06-19,07:42:25Z -SA man jailed^ tortured in Equatorial Guinea prison gets R39m in damages - News24,News24,2021-06-19,07:39:54Z -14 new community COVID-19 cases in Singapore^ including 4 unlinked infections - CNA,CNA,2021-06-19,07:37:19Z -Travellers who visited Sydney locations of interest should get tested immediately for Covid-19^ says Ministry of Health - Stuff.co.nz,Stuff.co.nz,2021-06-19,07:26:00Z -Coffee shop owner roasts ministries over RM10^000 fine - Malaysiakini,Malaysiakini,2021-06-19,07:24:21Z -Vaccine: Over five million doses administered nationwide — Adham - The Sun Daily,The Sun Daily,2021-06-19,07:24:00Z -Jason Kelk: UK's longest Covid patient dies after withdrawing treatment - Metro.co.uk,Metro.co.uk,2021-06-19,07:20:00Z +Live Updates: Tornado Hits Chicago Suburbs^ Causing Massive Damage - NBC Chicago,NBC Chicago,2021-06-21,14:36:30Z +Manchester City make Harry Kane bid worth at least £100m to Tottenham - The Guardian,The Guardian,2021-06-21,14:23:00Z +Released but unspent: P18 billion for tests^ health workers expiring June 30 - Rappler,Rappler,2021-06-21,14:22:00Z +Israeli health experts share best practices on vaccine rollout - ABS-CBN News,Abs-cbn.com,2021-06-21,14:21:00Z +LIVE Southampton Weather Updates^ June 21^ Monday^ India vs New Zealand Day 4^ WTC 2021 Final: Play Called Of - India.com,India.com,2021-06-21,14:14:47Z +Handel im Wandel: Hybride Konsumenten? - APA OTS,Www.ots.at,2021-06-21,14:11:54Z +Canada lifting restrictions for fully vaccinated travellers starting July 5 - CTV News,Ctvnews.ca,2021-06-21,14:11:53Z +Philippines^ Saudi Arabia reaffirm vow to protect OFWs - ABS-CBN News,Abs-cbn.com,2021-06-21,14:11:00Z +Geochemical study confirms cause of end-Permian mass extinction event - Phys.org,Phys.Org,2021-06-21,14:05:26Z +The laptops and tablets worth your money on Prime Day - Yahoo Tech,Engadget,2021-06-21,14:05:13Z +Gracie Spinks death: Derbyshire Police referred to watchdog - BBC News,BBC News,2021-06-21,14:03:22Z +Paul Walker's Toyota Supra from The Fast and the Furious fetches over half a million - CNET,CNET,2021-06-21,14:02:17Z +Stock market news live updates: Stocks^ Treasury yields rise as Dow recovers after worst weekly loss since October - Yahoo Finance,Yahoo Entertainment,2021-06-21,14:00:10Z +Millions of new smart TVs^ laptops and other items in Amazon warehouse marked 'destroy' - TheJournal.ie,TheJournal.ie,2021-06-21,13:57:00Z +Target Deal Days rival Amazon Prime Day with massive discounts — here are the best deals to shop - Yahoo Finance Australia,Intheknow.com,2021-06-21,13:56:09Z +PNB Housing Finance vs SEBI: SAT gives nod for EGM on June 22; Voting results to not be declared till... - Moneycontrol,Moneycontrol,2021-06-21,13:53:59Z +Sporadic Covid-19 cases still widespread in Klang Valley - Malaysiakini,Malaysiakini,2021-06-21,13:48:00Z +Samsung Odyssey G3^ Odyssey G5^ Odyssey G7 Gaming Monitors With 178 Degrees Viewing Angle Launched - Gadgets 360,NDTV News,2021-06-21,13:47:31Z +New possibilities for detecting Hawking radiation emitted by primordial black holes - Phys.org,Phys.Org,2021-06-21,13:40:03Z +Global Lip Fillers Market 2021 Industry Trends^ Growth^ Analysis^ Opportunities And Overview || DBMR – The Courier - The Courier,Mccourier.com,2021-06-21,13:39:38Z diff --git a/csv/settings.csv b/csv/settings.csv index cb79863..2a9a10f 100644 --- a/csv/settings.csv +++ b/csv/settings.csv @@ -1,2 +1,2 @@ speed,brightness -m,9 \ No newline at end of file +f,9 \ No newline at end of file diff --git a/csv/sports/NBA/future_games.json b/csv/sports/NBA/future_games.json new file mode 100644 index 0000000..1eba876 --- /dev/null +++ b/csv/sports/NBA/future_games.json @@ -0,0 +1 @@ +[{"date": "2021-06-21", "time": "00:00:00", "round": "0", "home_team": "Philadelphia 76ers", "home_score": "96", "away_team": "Atlanta Hawks", "away_score": "103"}, {"date": "2021-06-23", "time": "01:00:00", "round": "0", "home_team": "Phoenix Suns", "home_score": null, "away_team": "Los Angeles Clippers", "away_score": null}, {"date": "2021-06-24", "time": "00:30:00", "round": "0", "home_team": "Milwaukee Bucks", "home_score": null, "away_team": "Atlanta Hawks", "away_score": null}, {"date": "2021-06-25", "time": "01:00:00", "round": "0", "home_team": "Los Angeles Clippers", "home_score": null, "away_team": "Phoenix Suns", "away_score": null}, {"date": "2021-06-26", "time": "00:30:00", "round": "0", "home_team": "Milwaukee Bucks", "home_score": null, "away_team": "Atlanta Hawks", "away_score": null}, {"date": "2021-06-27", "time": "01:00:00", "round": "0", "home_team": "Los Angeles Clippers", "home_score": null, "away_team": "Phoenix Suns", "away_score": null}, {"date": "2021-06-28", "time": "00:30:00", "round": "0", "home_team": "Atlanta Hawks", "home_score": null, "away_team": "Milwaukee Bucks", "away_score": null}, {"date": "2021-06-30", "time": "00:30:00", "round": "0", "home_team": "Atlanta Hawks", "home_score": null, "away_team": "Milwaukee Bucks", "away_score": null}] \ No newline at end of file diff --git a/csv/sports/NBA/live_games.json b/csv/sports/NBA/live_games.json new file mode 100644 index 0000000..9ef4235 --- /dev/null +++ b/csv/sports/NBA/live_games.json @@ -0,0 +1 @@ +[{"date": "2021-06-21", "time": "00:00", "progess": "", "status": "FT", "home_team": "Philadelphia 76ers", "home_score": "96", "away_team": "Atlanta Hawks", "away_score": "103"}] \ No newline at end of file diff --git a/csv/sports/NBA/past_games.json b/csv/sports/NBA/past_games.json new file mode 100644 index 0000000..be884fa --- /dev/null +++ b/csv/sports/NBA/past_games.json @@ -0,0 +1 @@ +[{"date": "2021-06-20", "time": "19:30:00", "round": "0", "home_team": "Phoenix Suns", "home_score": "120", "away_team": "Los Angeles Clippers", "away_score": "114"}, {"date": "2021-06-20", "time": "00:30:00", "round": "0", "home_team": "Brooklyn Nets", "home_score": "111", "away_team": "Milwaukee Bucks", "away_score": "115"}, {"date": "2021-06-19", "time": "02:00:00", "round": "0", "home_team": "Los Angeles Clippers", "home_score": "131", "away_team": "Utah Jazz", "away_score": "119"}, {"date": "2021-06-18", "time": "23:30:00", "round": "0", "home_team": "Atlanta Hawks", "home_score": "99", "away_team": "Philadelphia 76ers", "away_score": "104"}, {"date": "2021-06-18", "time": "00:30:00", "round": "0", "home_team": "Milwaukee Bucks", "home_score": "104", "away_team": "Brooklyn Nets", "away_score": "89"}, {"date": "2021-06-17", "time": "02:00:00", "round": "0", "home_team": "Utah Jazz", "home_score": "111", "away_team": "Los Angeles Clippers", "away_score": "119"}, {"date": "2021-06-16", "time": "00:30:00", "round": "0", "home_team": "Brooklyn Nets", "home_score": "114", "away_team": "Milwaukee Bucks", "away_score": "108"}, {"date": "2021-06-16", "time": "23:30:00", "round": "0", "home_team": "Philadelphia 76ers", "home_score": "106", "away_team": "Atlanta Hawks", "away_score": "109"}, {"date": "2021-06-15", "time": "02:00:00", "round": "0", "home_team": "Los Angeles Clippers", "home_score": "118", "away_team": "Utah Jazz", "away_score": "104"}, {"date": "2021-06-14", "time": "23:30:00", "round": "0", "home_team": "Atlanta Hawks", "home_score": "103", "away_team": "Philadelphia 76ers", "away_score": "100"}, {"date": "2021-06-14", "time": "00:00:00", "round": "0", "home_team": "Denver Nuggets", "home_score": "118", "away_team": "Phoenix Suns", "away_score": "125"}, {"date": "2021-06-13", "time": "00:30:00", "round": "0", "home_team": "Los Angeles Clippers", "home_score": "132", "away_team": "Utah Jazz", "away_score": "106"}, {"date": "2021-06-13", "time": "19:00:00", "round": "0", "home_team": "Milwaukee Bucks", "home_score": "107", "away_team": "Brooklyn Nets", "away_score": "96"}, {"date": "2021-06-12", "time": "02:00:00", "round": "0", "home_team": "Denver Nuggets", "home_score": "102", "away_team": "Phoenix Suns", "away_score": "116"}, {"date": "2021-06-11", "time": "02:00:00", "round": "0", "home_team": "Utah Jazz", "home_score": "117", "away_team": "Los Angeles Clippers", "away_score": "111"}] \ No newline at end of file diff --git a/csv/sports/NBA/team_info.csv b/csv/sports/NBA/team_info.csv new file mode 100644 index 0000000..91df3bd --- /dev/null +++ b/csv/sports/NBA/team_info.csv @@ -0,0 +1,31 @@ +Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name +Atlanta Hawks,134880,ATL,Red,Atlanta.png +Boston Celtics,134860,BOS,Green,Boston.png +Brooklyn Nets,134861,BKN,White,Brooklyn.png +Charlotte Hornets,134881,CHA,Light blue,Charlotte.png +Chicago Bulls,134870,CHI,Red,Chicago.png +Cleveland Cavaliers,134871,CLE,Yellow,Cleveland.png +Dallas Mavericks,134875,DAL,Light blue,Dallas.png +Denver Nuggets,134885,DEN,Yellow,Denver.png +Detroit Pistons,134872,DET,Red,Detroit.png +Golden State Warriors,134865,GSW,Yellow,Golden State.png +Indiana Pacers,134873,IND,Yellow,Indiana.png +Houston Rockets,134876,HOU,Red,Houston.png +Los Angeles Clippers,134866,LAC,Red,LA.png +Los Angeles Lakers,134867,LAL,Purple,LA Lakers.png +Memphis Grizzlies,134877,MEM,Dark blue,Memphis.png +Miami Heat,134882,MIA,Red,Miami.png +Milwaukee Bucks,134874,MIL,Green,Milwaukee.png +Minnesota Timberwolves,134886,MIN,Blue,Minnesota.png +New Orleans Pelicans,134878,NOP,Gold,New Orleans.png +New York Knicks,134862,NYK,Orange,New York.png +Oklahoma City Thunder,134887,OKC,Orange,Oklahoma City.png +Orlando Magic,134883,ORL,Light blue,Orlando.png +Philadelphia 76ers,134863,PHI,Light blue,Philadelphia.png +Utah Jazz,134889,UTA,Yellow,Utah.png +Portland Trail Blazers,134888,POR,Red,Portland.png +Sacramento Kings,134869,SAC,Purple,Sacramento.png +San Antonio Spurs,134879,SAS,Gray,San Antonio.png +Toronto Raptors,134864,TOR,Gray,Toronto.png +Phoenix Suns,134868,PHX,Orange,Phoenix.png +Washington Wizards,134884,WAS,Red,Washington.png diff --git a/csv/sports/NFL/future_games.json b/csv/sports/NFL/future_games.json new file mode 100644 index 0000000..c5cf9a2 --- /dev/null +++ b/csv/sports/NFL/future_games.json @@ -0,0 +1 @@ +[{"date": "2021-09-10", "time": "01:20:00", "round": "1", "home_team": "Tampa Bay Buccaneers", "home_score": null, "away_team": "Dallas Cowboys", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Atlanta Falcons", "home_score": null, "away_team": "Philadelphia Eagles", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Buffalo Bills", "home_score": null, "away_team": "Pittsburgh Steelers", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Carolina Panthers", "home_score": null, "away_team": "New York Jets", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Cincinnati Bengals", "home_score": null, "away_team": "Minnesota Vikings", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Detroit Lions", "home_score": null, "away_team": "San Francisco 49ers", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Houston Texans", "home_score": null, "away_team": "Jacksonville Jaguars", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Indianapolis Colts", "home_score": null, "away_team": "Seattle Seahawks", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Tennessee Titans", "home_score": null, "away_team": "Arizona Cardinals", "away_score": null}, {"date": "2021-09-12", "time": "18:00:00", "round": "1", "home_team": "Washington", "home_score": null, "away_team": "Los Angeles Chargers", "away_score": null}, {"date": "2021-09-12", "time": "21:25:00", "round": "1", "home_team": "Kansas City Chiefs", "home_score": null, "away_team": "Cleveland Browns", "away_score": null}, {"date": "2021-09-12", "time": "21:25:00", "round": "1", "home_team": "New England Patriots", "home_score": null, "away_team": "Miami Dolphins", "away_score": null}, {"date": "2021-09-12", "time": "21:25:00", "round": "1", "home_team": "New Orleans Saints", "home_score": null, "away_team": "Green Bay Packers", "away_score": null}, {"date": "2021-09-12", "time": "21:25:00", "round": "1", "home_team": "New York Giants", "home_score": null, "away_team": "Denver Broncos", "away_score": null}, {"date": "2021-09-13", "time": "01:20:00", "round": "1", "home_team": "Los Angeles Rams", "home_score": null, "away_team": "Chicago Bears", "away_score": null}] \ No newline at end of file diff --git a/csv/sports/NFL/live_games.json b/csv/sports/NFL/live_games.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/csv/sports/NFL/live_games.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/csv/sports/NFL/past_games.json b/csv/sports/NFL/past_games.json new file mode 100644 index 0000000..a213a28 --- /dev/null +++ b/csv/sports/NFL/past_games.json @@ -0,0 +1 @@ +[{"date": "2021-02-07", "time": "23:30:00", "round": "200", "home_team": "Tampa Bay Buccaneers", "home_score": "31", "away_team": "Kansas City Chiefs", "away_score": "9"}, {"date": "2021-01-24", "time": "23:40:00", "round": "20", "home_team": "Kansas City Chiefs", "home_score": "38", "away_team": "Buffalo Bills", "away_score": "24"}, {"date": "2021-01-24", "time": "20:05:00", "round": "20", "home_team": "Green Bay Packers", "home_score": "26", "away_team": "Tampa Bay Buccaneers", "away_score": "31"}, {"date": "2021-01-17", "time": "23:40", "round": "19", "home_team": "New Orleans Saints", "home_score": "20", "away_team": "Tampa Bay Buccaneers", "away_score": "30"}, {"date": "2021-01-17", "time": "20:05", "round": "19", "home_team": "Kansas City Chiefs", "home_score": "22", "away_team": "Cleveland Browns", "away_score": "17"}, {"date": "2021-01-17", "time": "1:15:00", "round": "19", "home_team": "Buffalo Bills", "home_score": "17", "away_team": "Baltimore Ravens", "away_score": "3"}, {"date": "2021-01-16", "time": "21:35:00", "round": "19", "home_team": "Green Bay Packers", "home_score": "32", "away_team": "Los Angeles Rams", "away_score": "18"}, {"date": "2021-01-11", "time": "01:15:00", "round": "18", "home_team": "Pittsburgh Steelers", "home_score": "37", "away_team": "Cleveland Browns", "away_score": "48"}, {"date": "2021-01-10", "time": "21:40:00", "round": "18", "home_team": "New Orleans Saints", "home_score": "21", "away_team": "Chicago Bears", "away_score": "9"}, {"date": "2021-01-10", "time": "18:05:00", "round": "18", "home_team": "Tennessee Titans", "home_score": "13", "away_team": "Baltimore Ravens", "away_score": "20"}, {"date": "2021-01-10", "time": "02:15:00", "round": "18", "home_team": "Washington", "home_score": "23", "away_team": "Tampa Bay Buccaneers", "away_score": "31"}, {"date": "2021-01-09", "time": "21:40:00", "round": "18", "home_team": "Seattle Seahawks", "home_score": "20", "away_team": "Los Angeles Rams", "away_score": "30"}, {"date": "2021-01-09", "time": "18:05:00", "round": "18", "home_team": "Buffalo Bills", "home_score": "27", "away_team": "Indianapolis Colts", "away_score": "24"}, {"date": "2021-01-04", "time": "01:20:00", "round": "17", "home_team": "Philadelphia Eagles", "home_score": "14", "away_team": "Washington", "away_score": "20"}, {"date": "2021-01-03", "time": "21:25:00", "round": "17", "home_team": "San Francisco 49ers", "home_score": "23", "away_team": "Seattle Seahawks", "away_score": "26"}] \ No newline at end of file diff --git a/csv/sports/NFL/team_info.csv b/csv/sports/NFL/team_info.csv new file mode 100644 index 0000000..bef975e --- /dev/null +++ b/csv/sports/NFL/team_info.csv @@ -0,0 +1,33 @@ +Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name +Arizona Cardinals,134946,ARI,Red,Arizona.png +Atlanta Falcons,134942,ATL,Red,Atlanta.png +Baltimore Ravens,134922,BAL,Purple,Baltimore.png +Buffalo Bills,134918,BUF,Blue,Buffalo.png +Carolina Panthers,134943,CAR,Blue,Carolina.png +Chicago Bears,134938,CHI,Orange,Chicago.png +Cincinnati Bengals,134923,CIN,Orange,Cincinnati.png +Cleveland Browns,134924,CLE,Orange,Cleveland.png +Dallas Cowboys,134934,DAL,Dark blue,Dallas.png +Denver Broncos,134930,DEN,Orange,Denver.png +Detroit Lions,134939,DET,Blue,Detroit.png +Green Bay Packers,134940,GB,Dark green,Green Bay.png +Houston Texans,134926,HOU,Dark blue,Houston.png +Indianapolis Colts,134927,IND,Dark blue,Indianapolis.png +Jacksonville Jaguars,134928,JAX,Gold,Jacksonville.png +Kansas City Chiefs,134931,KC,Red,Kansas City.png +Las Vegas Raiders,134932,OAK,White,Oakland.png +Los Angeles Chargers,135908,LAC,Yellow,Los Angeles Chargers.png +Los Angeles Rams,135907,LA,Blue,Los Angeles Rams.png +Miami Dolphins,134919,MIA,Light blue,Miami.png +Minnesota Vikings,134941,MIN,Purple,Minnesota.png +New England Patriots,134920,NE,Dark blue,New England.png +New Orleans Saints,134944,NO,Gold,New Orleans.png +New York Giants,134935,NYG,Dark blue,New York Giants.png +New York Jets,134921,NYJ,Green,New York Jets.png +Philadelphia Eagles,134936,PHI,Dark green,Philadelphia.png +Pittsburgh Steelers,134925,PIT,Yellow,Pittsburgh.png +San Francisco 49ers,134948,SF,Gold,San Francisco.png +Seattle Seahawks,134949,SEA,Dark blue,Seattle.png +Tampa Bay Buccaneers,134945,TB,Red,Tampa Bay.png +Tennessee Titans,134929,TEN,Light blue,Tennessee.png +Washington,134937,WAS,Dark red,Washington.png diff --git a/csv/sports/NHL/future_games.json b/csv/sports/NHL/future_games.json index eddc0a3..9c14c53 100644 --- a/csv/sports/NHL/future_games.json +++ b/csv/sports/NHL/future_games.json @@ -1 +1 @@ -[{"date": "2021-06-19", "time": "00:00:00", "round": "0", "home_team": "Montreal Canadiens", "home_score": "3", "away_team": "Vegas Golden Knights", "away_score": "2"}, {"date": "2021-06-20", "time": "00:00:00", "round": "0", "home_team": "New York Islanders", "home_score": null, "away_team": "Tampa Bay Lightning", "away_score": null}, {"date": "2021-06-21", "time": "00:00:00", "round": "0", "home_team": "Montreal Canadiens", "home_score": null, "away_team": "Vegas Golden Knights", "away_score": null}, {"date": "2021-06-22", "time": "00:00:00", "round": "0", "home_team": "Tampa Bay Lightning", "home_score": null, "away_team": "New York Islanders", "away_score": null}, {"date": "2021-06-23", "time": "01:00:00", "round": "0", "home_team": "Vegas Golden Knights", "home_score": null, "away_team": "Montreal Canadiens", "away_score": null}] \ No newline at end of file +[{"date": "2021-06-21", "time": "00:00:00", "round": "0", "home_team": "Montreal Canadiens", "home_score": "1", "away_team": "Vegas Golden Knights", "away_score": "2"}, {"date": "2021-06-22", "time": "00:00:00", "round": "0", "home_team": "Tampa Bay Lightning", "home_score": null, "away_team": "New York Islanders", "away_score": null}, {"date": "2021-06-23", "time": "01:00:00", "round": "0", "home_team": "Vegas Golden Knights", "home_score": null, "away_team": "Montreal Canadiens", "away_score": null}, {"date": "2021-06-24", "time": "00:00:00", "round": "0", "home_team": "New York Islanders", "home_score": null, "away_team": "Tampa Bay Lightning", "away_score": null}, {"date": "2021-06-25", "time": "00:00:00", "round": "0", "home_team": "Montreal Canadiens", "home_score": null, "away_team": "Vegas Golden Knights", "away_score": null}] \ No newline at end of file diff --git a/csv/sports/NHL/live_games.json b/csv/sports/NHL/live_games.json index ad43b1d..30c03cf 100644 --- a/csv/sports/NHL/live_games.json +++ b/csv/sports/NHL/live_games.json @@ -1 +1 @@ -[{"date": "2021-06-19", "time": "00:00", "progess": "", "status": "AOT", "home_team": "Montreal Canadiens", "home_score": "3", "away_team": "Vegas Golden Knights", "away_score": "2"}] \ No newline at end of file +[{"date": "2021-06-21", "time": "00:00", "progess": "", "status": "AOT", "home_team": "Montreal Canadiens", "home_score": "1", "away_team": "Vegas Golden Knights", "away_score": "2"}] \ No newline at end of file diff --git a/csv/sports/NHL/past_games.json b/csv/sports/NHL/past_games.json index db3411a..29c32e9 100644 --- a/csv/sports/NHL/past_games.json +++ b/csv/sports/NHL/past_games.json @@ -1 +1 @@ -[{"date": "2021-06-16", "time": "00:00:00", "home_team": "Tampa Bay Lightning", "home_score": "4", "away_team": "New York Islanders", "away_score": "2", "round": "0"}, {"date": "2021-06-15", "time": "01:00:00", "home_team": "Vegas Golden Knights", "home_score": "4", "away_team": "Montreal Canadiens", "away_score": "1", "round": "0"}, {"date": "2021-06-13", "time": "19:00:00", "home_team": "Tampa Bay Lightning", "home_score": "1", "away_team": "New York Islanders", "away_score": "2", "round": "0"}, {"date": "2021-06-11", "time": "01:00:00", "home_team": "Vegas Golden Knights", "home_score": "6", "away_team": "Colorado Avalanche", "away_score": "3", "round": "0"}, {"date": "2021-06-09", "time": "23:30:00", "home_team": "New York Islanders", "home_score": "6", "away_team": "Boston Bruins", "away_score": "2", "round": "0"}, {"date": "2021-06-09", "time": "01:00:00", "home_team": "Colorado Avalanche", "home_score": "2", "away_team": "Vegas Golden Knights", "away_score": "3", "round": "0"}, {"date": "2021-06-08", "time": "22:30:00", "home_team": "Carolina Hurricanes", "home_score": "0", "away_team": "Tampa Bay Lightning", "away_score": "2", "round": "0"}, {"date": "2021-06-08", "time": "00:00:00", "home_team": "Montreal Canadiens", "home_score": "3", "away_team": "Winnipeg Jets", "away_score": "2", "round": "0"}, {"date": "2021-06-07", "time": "22:30:00", "home_team": "Boston Bruins", "home_score": "4", "away_team": "New York Islanders", "away_score": "5", "round": "0"}, {"date": "2021-06-07", "time": "00:30:00", "home_team": "Vegas Golden Knights", "home_score": "5", "away_team": "Colorado Avalanche", "away_score": "1", "round": "0"}, {"date": "2021-06-06", "time": "22:00:00", "home_team": "Montreal Canadiens", "home_score": "5", "away_team": "Winnipeg Jets", "away_score": "1", "round": "0"}, {"date": "2021-06-05", "time": "23:15:00", "home_team": "New York Islanders", "home_score": "4", "away_team": "Boston Bruins", "away_score": "1", "round": "0"}, {"date": "2021-06-05", "time": "20:00:00", "home_team": "Tampa Bay Lightning", "home_score": "6", "away_team": "Carolina Hurricanes", "away_score": "4", "round": "0"}, {"date": "2021-06-05", "time": "02:00:00", "home_team": "Vegas Golden Knights", "home_score": "3", "away_team": "Colorado Avalanche", "away_score": "2", "round": "0"}, {"date": "2021-06-04", "time": "23:30:00", "home_team": "Winnipeg Jets", "home_score": "0", "away_team": "Montreal Canadiens", "away_score": "1", "round": "0"}] \ No newline at end of file +[{"date": "2021-06-20", "time": "00:00:00", "round": "0", "home_team": "New York Islanders", "home_score": "3", "away_team": "Tampa Bay Lightning", "away_score": "2"}, {"date": "2021-06-19", "time": "00:00:00", "round": "0", "home_team": "Montreal Canadiens", "home_score": "3", "away_team": "Vegas Golden Knights", "away_score": "2"}, {"date": "2021-06-18", "time": "00:00:00", "round": "0", "home_team": "New York Islanders", "home_score": "1", "away_team": "Tampa Bay Lightning", "away_score": "2"}, {"date": "2021-06-17", "time": "01:00:00", "round": "0", "home_team": "Vegas Golden Knights", "home_score": "2", "away_team": "Montreal Canadiens", "away_score": "3"}, {"date": "2021-06-16", "time": "00:00:00", "round": "0", "home_team": "Tampa Bay Lightning", "home_score": "4", "away_team": "New York Islanders", "away_score": "2"}, {"date": "2021-06-15", "time": "01:00:00", "round": "0", "home_team": "Vegas Golden Knights", "home_score": "4", "away_team": "Montreal Canadiens", "away_score": "1"}, {"date": "2021-06-13", "time": "19:00:00", "round": "0", "home_team": "Tampa Bay Lightning", "home_score": "1", "away_team": "New York Islanders", "away_score": "2"}, {"date": "2021-06-11", "time": "01:00:00", "round": "0", "home_team": "Vegas Golden Knights", "home_score": "6", "away_team": "Colorado Avalanche", "away_score": "3"}, {"date": "2021-06-09", "time": "23:30:00", "round": "0", "home_team": "New York Islanders", "home_score": "6", "away_team": "Boston Bruins", "away_score": "2"}, {"date": "2021-06-09", "time": "01:00:00", "round": "0", "home_team": "Colorado Avalanche", "home_score": "2", "away_team": "Vegas Golden Knights", "away_score": "3"}, {"date": "2021-06-08", "time": "22:30:00", "round": "0", "home_team": "Carolina Hurricanes", "home_score": "0", "away_team": "Tampa Bay Lightning", "away_score": "2"}, {"date": "2021-06-08", "time": "00:00:00", "round": "0", "home_team": "Montreal Canadiens", "home_score": "3", "away_team": "Winnipeg Jets", "away_score": "2"}, {"date": "2021-06-07", "time": "22:30:00", "round": "0", "home_team": "Boston Bruins", "home_score": "4", "away_team": "New York Islanders", "away_score": "5"}, {"date": "2021-06-07", "time": "00:30:00", "round": "0", "home_team": "Vegas Golden Knights", "home_score": "5", "away_team": "Colorado Avalanche", "away_score": "1"}, {"date": "2021-06-06", "time": "22:00:00", "round": "0", "home_team": "Montreal Canadiens", "home_score": "5", "away_team": "Winnipeg Jets", "away_score": "1"}] \ No newline at end of file diff --git a/csv/sports/NHL/team_info.csv b/csv/sports/NHL/team_info.csv index 83b9a84..1ffe8c5 100644 --- a/csv/sports/NHL/team_info.csv +++ b/csv/sports/NHL/team_info.csv @@ -1,32 +1,32 @@ -Full Team Name,Team ID,3 Letter ID,Logo File name,Team Color -Arizona Coyotes,134847,ARI,coyotes.png,Red -Anaheim Ducks,134846,ANA,ducks.png,Gold -Boston Bruins,134830,BOS,bruins.png,Yellow -Colorado Avalanche,134855,COL,avalanche.png,Red -Chicago Blackhawks,134854,CHI,blackhawks.png,"Orange, Yellow, Red" -Columbus Blue Jackets,134839,CBJ,blue-jackets.png,"Red, Blue" -St. Louis Blues,134859,STL,blues.png,Blue -Montreal Canadiens,134834,MTL,canadiens.png,Red -Vancouver Canucks,134850,VAN,canucks.png,Blue -Washington Capitals,134845,WSH,capitals.png,"Red, Blue" -New Jersey Devils,134840,NJD,devils.png,Red -Calgary Flames,134848,CGY,flames.png,Orange -Philadelphia Flyers,134843,PHI,flyers.png,White -Carolina Hurricanes,134838,CAR,hurricanes.png,"Red, white" -New York Islanders,134841,NYI,islanders.png,Orange -Winnipeg Jets,134851,WPG,jets.png, -Los Angeles Kings,134852,LAK,kings.png, -Vegas Golden Knights,135913,VGK,knights.png, -Tampa Bay Lightning,134836,TBL,lightning.png, -Toronto Maple Leafs,134837,TOR,maple-leafs.png, -Edmonton Oilers,134849,EDM,oilers.png, -Florida Panthers,134833,FLA,panthers.png, -Pittsburgh Penguins,134844,PIT,penguins.png, -Nashville Predators,134858,NSH,predators.png, -New York Rangers,134842,NYR,rangers.png, -Detroit Red Wings,134832,DET,red-wings.png, -Buffalo Sabres,134831,BUF,sabres.png, -Ottawa Senators,134835,OTT,senators.png, -San Jose Sharks,134853,SJS,sharks.png, -Dallas Stars,134856,DAL,stars.png, -Minnesota Wild,134857,MIN,wild.png, +Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name,,Season +Arizona Coyotes,134847,ARI,Red,coyotes.png,,Off +Anaheim Ducks,134846,ANA,Gold,ducks.png,,Pre +Boston Bruins,134830,BOS,Yellow,bruins.png,,On +Colorado Avalanche,134855,COL,Red,avalanche.png,,Semi Finals +Chicago Blackhawks,134854,CHI,Orange,blackhawks.png,,Finals +Columbus Blue Jackets,134839,CBJ,Blue,blue-jackets.png,, +St. Louis Blues,134859,STL,Blue,blues.png,, +Montreal Canadiens,134834,MTL,Red,canadiens.png,, +Vancouver Canucks,134850,VAN,Blue,canucks.png,, +Washington Capitals,134845,WSH,Blue,capitals.png,, +New Jersey Devils,134840,NJD,Red,devils.png,, +Calgary Flames,134848,CGY,Orange,flames.png,, +Philadelphia Flyers,134843,PHI,White,flyers.png,, +Carolina Hurricanes,134838,CAR,Red,hurricanes.png,, +New York Islanders,134841,NYI,Orange,islanders.png,, +Winnipeg Jets,134851,WPG,Blue,jets.png,, +Los Angeles Kings,134852,LAK,Gray,kings.png,, +Vegas Golden Knights,135913,VGK,Gold,knights.png,, +Tampa Bay Lightning,134836,TBL,Blue,lightning.png,, +Toronto Maple Leafs,134837,TOR,Blue,maple-leafs.png,, +Edmonton Oilers,134849,EDM,Orange,oilers.png,, +Florida Panthers,134833,FLA,Red,panthers.png,, +Pittsburgh Penguins,134844,PIT,Yellow,penguins.png,, +Nashville Predators,134858,NSH,Yellow,predators.png,, +New York Rangers,134842,NYR,Blue,rangers.png,, +Detroit Red Wings,134832,DET,Red,red-wings.png,, +Buffalo Sabres,134831,BUF,Yellow,sabres.png,, +Ottawa Senators,134835,OTT,Gold,senators.png,, +San Jose Sharks,134853,SJS,Light blue,sharks.png,, +Dallas Stars,134856,DAL,Green,stars.png,, +Minnesota Wild,134857,MIN,Green,wild.png,, diff --git a/csv/sports/premier_league/team_info.csv b/csv/sports/premier_league/team_info.csv new file mode 100644 index 0000000..f935bd5 --- /dev/null +++ b/csv/sports/premier_league/team_info.csv @@ -0,0 +1,21 @@ +Full Team Name,Team ID,3 Letter ID,Team Color,Logo File name +Arsenal,133604,ARS,Red,Arsenal.png +Aston Villa,133601,AVL,Light blue,AVFC.png +Brentford,134355,BRE,Red,Brentford.png +Brighton,133619,BRI,Blue,Brighton.png +Burnley,133623,BUR,Light blue,Burnley.png +Chelsea,133610,CHE,Dark blue,Chelsea.png +Crystal Palace,133632,CRY,Blue,Crystal Palace.png +Everton,133615,EVE,Blue,Everton.png +Leeds,133635,LEE,Yellow,Leeds.png +Leicester,133626,LEI,Blue,Leicester.png +Liverpool,133602,LIV,Red,Liverpool.png +Man City,133613,MCI,Blue,Manchester City.png +Man United,133612,MUN,Red,Man United.png +Newcastle,134777,NEW,Light blue,Newcastle.png +Norwich,133608,NOR,Green,Norwich.png +Southampton,134778,SOU,Red,Southampton.png +Tottenham,133616,TOT,Dark blue,Tottenham.png +Watford,133624,WAT,Red,Watford.png +West Ham,133636,WHU,Red,West Ham.png +Wolves,133599,WOL,Yellow,Wolves.png diff --git a/csv/tickers.csv b/csv/tickers.csv index 9a1d726..0ef83c2 100644 --- a/csv/tickers.csv +++ b/csv/tickers.csv @@ -1,4 +1,4 @@ name,current,opening -MSFT,259.43,259.63 -NFLX,500.77,496.4 -GOOG,2511.35,2514.11 +MSFT,262.3758,259.82 +NFLX,494.8007,501.64 +GOOG,2530.35,2514.8 diff --git a/final.ppm b/final.ppm index fd07072..d2f0375 100755 Binary files a/final.ppm and b/final.ppm differ diff --git a/full.ppm b/full.ppm new file mode 100755 index 0000000..e51f3a9 Binary files /dev/null and b/full.ppm differ diff --git a/league.ppm b/league.ppm index d139a10..97ad5b2 100755 Binary files a/league.ppm and b/league.ppm differ diff --git a/log.txt b/log.txt index e69de29..70b5fcd 100755 --- a/log.txt +++ b/log.txt @@ -0,0 +1,9 @@ +'Sheffield United'. file: stockTicker.py. line: 1402. type: + Traceback (most recent call last): + File "stockTicker.py", line 1402, in + stock_ticker.process_msg('P') + File "stockTicker.py", line 1361, in process_msg + img = self.getLeagueImage('premier_league', 'past') + File "stockTicker.py", line 680, in getLeagueImage + h_colour = mcolors.to_rgb(sports_info[home_team]['colour'].replace(' ', '')) +KeyError: 'Sheffield United' diff --git a/logos/sports/NBA/Atlanta.png b/logos/sports/NBA/Atlanta.png new file mode 100644 index 0000000..f005c72 Binary files /dev/null and b/logos/sports/NBA/Atlanta.png differ diff --git a/logos/sports/NBA/Boston.png b/logos/sports/NBA/Boston.png new file mode 100644 index 0000000..2e1da25 Binary files /dev/null and b/logos/sports/NBA/Boston.png differ diff --git a/logos/sports/NBA/Brooklyn.png b/logos/sports/NBA/Brooklyn.png new file mode 100644 index 0000000..8e6b8c3 Binary files /dev/null and b/logos/sports/NBA/Brooklyn.png differ diff --git a/logos/sports/NBA/Charlotte.png b/logos/sports/NBA/Charlotte.png new file mode 100644 index 0000000..74a30fa Binary files /dev/null and b/logos/sports/NBA/Charlotte.png differ diff --git a/logos/sports/NBA/Chicago.png b/logos/sports/NBA/Chicago.png new file mode 100644 index 0000000..994f97e Binary files /dev/null and b/logos/sports/NBA/Chicago.png differ diff --git a/logos/sports/NBA/Cleveland.png b/logos/sports/NBA/Cleveland.png new file mode 100644 index 0000000..94d4f0a Binary files /dev/null and b/logos/sports/NBA/Cleveland.png differ diff --git a/logos/sports/NBA/Dallas.png b/logos/sports/NBA/Dallas.png new file mode 100644 index 0000000..d727821 Binary files /dev/null and b/logos/sports/NBA/Dallas.png differ diff --git a/logos/sports/NBA/Denver.png b/logos/sports/NBA/Denver.png new file mode 100644 index 0000000..9a9b681 Binary files /dev/null and b/logos/sports/NBA/Denver.png differ diff --git a/logos/sports/NBA/Detroit.png b/logos/sports/NBA/Detroit.png new file mode 100644 index 0000000..4dcb46d Binary files /dev/null and b/logos/sports/NBA/Detroit.png differ diff --git a/logos/sports/NBA/Golden State.png b/logos/sports/NBA/Golden State.png new file mode 100644 index 0000000..1091ced Binary files /dev/null and b/logos/sports/NBA/Golden State.png differ diff --git a/logos/sports/NBA/Houston.png b/logos/sports/NBA/Houston.png new file mode 100644 index 0000000..57dc4ce Binary files /dev/null and b/logos/sports/NBA/Houston.png differ diff --git a/logos/sports/NBA/Indiana.png b/logos/sports/NBA/Indiana.png new file mode 100644 index 0000000..5ed9fab Binary files /dev/null and b/logos/sports/NBA/Indiana.png differ diff --git a/logos/sports/NBA/LA Lakers.png b/logos/sports/NBA/LA Lakers.png new file mode 100644 index 0000000..7520750 Binary files /dev/null and b/logos/sports/NBA/LA Lakers.png differ diff --git a/logos/sports/NBA/LA.png b/logos/sports/NBA/LA.png new file mode 100644 index 0000000..a509f14 Binary files /dev/null and b/logos/sports/NBA/LA.png differ diff --git a/logos/sports/NBA/Memphis.png b/logos/sports/NBA/Memphis.png new file mode 100644 index 0000000..a46dc27 Binary files /dev/null and b/logos/sports/NBA/Memphis.png differ diff --git a/logos/sports/NBA/Miami.png b/logos/sports/NBA/Miami.png new file mode 100644 index 0000000..b56c98d Binary files /dev/null and b/logos/sports/NBA/Miami.png differ diff --git a/logos/sports/NBA/Milwaukee.png b/logos/sports/NBA/Milwaukee.png new file mode 100644 index 0000000..fd0cbc7 Binary files /dev/null and b/logos/sports/NBA/Milwaukee.png differ diff --git a/logos/sports/NBA/Minnesota.png b/logos/sports/NBA/Minnesota.png new file mode 100644 index 0000000..cff1b95 Binary files /dev/null and b/logos/sports/NBA/Minnesota.png differ diff --git a/logos/sports/NBA/New Orleans.png b/logos/sports/NBA/New Orleans.png new file mode 100644 index 0000000..bb77811 Binary files /dev/null and b/logos/sports/NBA/New Orleans.png differ diff --git a/logos/sports/NBA/New York.png b/logos/sports/NBA/New York.png new file mode 100644 index 0000000..afbea81 Binary files /dev/null and b/logos/sports/NBA/New York.png differ diff --git a/logos/sports/NBA/Oklahoma City.png b/logos/sports/NBA/Oklahoma City.png new file mode 100644 index 0000000..7a7487f Binary files /dev/null and b/logos/sports/NBA/Oklahoma City.png differ diff --git a/logos/sports/NBA/Orlando.png b/logos/sports/NBA/Orlando.png new file mode 100644 index 0000000..26896f7 Binary files /dev/null and b/logos/sports/NBA/Orlando.png differ diff --git a/logos/sports/NBA/Philadelphia.png b/logos/sports/NBA/Philadelphia.png new file mode 100644 index 0000000..242652e Binary files /dev/null and b/logos/sports/NBA/Philadelphia.png differ diff --git a/logos/sports/NBA/Phoenix.png b/logos/sports/NBA/Phoenix.png new file mode 100644 index 0000000..79bb397 Binary files /dev/null and b/logos/sports/NBA/Phoenix.png differ diff --git a/logos/sports/NBA/Portland.png b/logos/sports/NBA/Portland.png new file mode 100644 index 0000000..490881b Binary files /dev/null and b/logos/sports/NBA/Portland.png differ diff --git a/logos/sports/NBA/Sacramento.png b/logos/sports/NBA/Sacramento.png new file mode 100644 index 0000000..fa7ca3b Binary files /dev/null and b/logos/sports/NBA/Sacramento.png differ diff --git a/logos/sports/NBA/San Antonio.png b/logos/sports/NBA/San Antonio.png new file mode 100644 index 0000000..c10b286 Binary files /dev/null and b/logos/sports/NBA/San Antonio.png differ diff --git a/logos/sports/NBA/Toronto.png b/logos/sports/NBA/Toronto.png new file mode 100644 index 0000000..d038db8 Binary files /dev/null and b/logos/sports/NBA/Toronto.png differ diff --git a/logos/sports/NBA/Utah.png b/logos/sports/NBA/Utah.png new file mode 100644 index 0000000..9ee0ec5 Binary files /dev/null and b/logos/sports/NBA/Utah.png differ diff --git a/logos/sports/NBA/Washington.png b/logos/sports/NBA/Washington.png new file mode 100644 index 0000000..a3ea2a7 Binary files /dev/null and b/logos/sports/NBA/Washington.png differ diff --git a/logos/sports/NFL/Arizona.png b/logos/sports/NFL/Arizona.png new file mode 100644 index 0000000..da87be5 Binary files /dev/null and b/logos/sports/NFL/Arizona.png differ diff --git a/logos/sports/NFL/Atlanta.png b/logos/sports/NFL/Atlanta.png new file mode 100644 index 0000000..f3bed42 Binary files /dev/null and b/logos/sports/NFL/Atlanta.png differ diff --git a/logos/sports/NFL/Baltimore.png b/logos/sports/NFL/Baltimore.png new file mode 100644 index 0000000..a98aaab Binary files /dev/null and b/logos/sports/NFL/Baltimore.png differ diff --git a/logos/sports/NFL/Buffalo.png b/logos/sports/NFL/Buffalo.png new file mode 100644 index 0000000..e6b282d Binary files /dev/null and b/logos/sports/NFL/Buffalo.png differ diff --git a/logos/sports/NFL/Carolina.png b/logos/sports/NFL/Carolina.png new file mode 100644 index 0000000..49ad10a Binary files /dev/null and b/logos/sports/NFL/Carolina.png differ diff --git a/logos/sports/NFL/Chicago.png b/logos/sports/NFL/Chicago.png new file mode 100644 index 0000000..354d568 Binary files /dev/null and b/logos/sports/NFL/Chicago.png differ diff --git a/logos/sports/NFL/Cincinnati.png b/logos/sports/NFL/Cincinnati.png new file mode 100644 index 0000000..1e51363 Binary files /dev/null and b/logos/sports/NFL/Cincinnati.png differ diff --git a/logos/sports/NFL/Cleveland.png b/logos/sports/NFL/Cleveland.png new file mode 100644 index 0000000..e11adb9 Binary files /dev/null and b/logos/sports/NFL/Cleveland.png differ diff --git a/logos/sports/NFL/Dallas.png b/logos/sports/NFL/Dallas.png new file mode 100644 index 0000000..9f62d8b Binary files /dev/null and b/logos/sports/NFL/Dallas.png differ diff --git a/logos/sports/NFL/Denver.png b/logos/sports/NFL/Denver.png new file mode 100644 index 0000000..40afbed Binary files /dev/null and b/logos/sports/NFL/Denver.png differ diff --git a/logos/sports/NFL/Detroit.png b/logos/sports/NFL/Detroit.png new file mode 100644 index 0000000..6628fa3 Binary files /dev/null and b/logos/sports/NFL/Detroit.png differ diff --git a/logos/sports/NFL/Green Bay.png b/logos/sports/NFL/Green Bay.png new file mode 100644 index 0000000..670977a Binary files /dev/null and b/logos/sports/NFL/Green Bay.png differ diff --git a/logos/sports/NFL/Houston.png b/logos/sports/NFL/Houston.png new file mode 100644 index 0000000..e19d444 Binary files /dev/null and b/logos/sports/NFL/Houston.png differ diff --git a/logos/sports/NFL/Indianapolis.png b/logos/sports/NFL/Indianapolis.png new file mode 100644 index 0000000..add9658 Binary files /dev/null and b/logos/sports/NFL/Indianapolis.png differ diff --git a/logos/sports/NFL/Jacksonville.png b/logos/sports/NFL/Jacksonville.png new file mode 100644 index 0000000..cc11d51 Binary files /dev/null and b/logos/sports/NFL/Jacksonville.png differ diff --git a/logos/sports/NFL/Kansas City.png b/logos/sports/NFL/Kansas City.png new file mode 100644 index 0000000..3b8f2c7 Binary files /dev/null and b/logos/sports/NFL/Kansas City.png differ diff --git a/logos/sports/NFL/Los Angeles Chargers.png b/logos/sports/NFL/Los Angeles Chargers.png new file mode 100644 index 0000000..9d4b99e Binary files /dev/null and b/logos/sports/NFL/Los Angeles Chargers.png differ diff --git a/logos/sports/NFL/Los Angeles Rams.png b/logos/sports/NFL/Los Angeles Rams.png new file mode 100644 index 0000000..4c02fc8 Binary files /dev/null and b/logos/sports/NFL/Los Angeles Rams.png differ diff --git a/logos/sports/NFL/Miami.png b/logos/sports/NFL/Miami.png new file mode 100644 index 0000000..97e9e3d Binary files /dev/null and b/logos/sports/NFL/Miami.png differ diff --git a/logos/sports/NFL/Minnesota.png b/logos/sports/NFL/Minnesota.png new file mode 100644 index 0000000..48a4726 Binary files /dev/null and b/logos/sports/NFL/Minnesota.png differ diff --git a/logos/sports/NFL/New England.png b/logos/sports/NFL/New England.png new file mode 100644 index 0000000..35494d7 Binary files /dev/null and b/logos/sports/NFL/New England.png differ diff --git a/logos/sports/NFL/New Orleans.png b/logos/sports/NFL/New Orleans.png new file mode 100644 index 0000000..88907f0 Binary files /dev/null and b/logos/sports/NFL/New Orleans.png differ diff --git a/logos/sports/NFL/New York Giants.png b/logos/sports/NFL/New York Giants.png new file mode 100644 index 0000000..66c80d3 Binary files /dev/null and b/logos/sports/NFL/New York Giants.png differ diff --git a/logos/sports/NFL/New York Jets.png b/logos/sports/NFL/New York Jets.png new file mode 100644 index 0000000..cc61847 Binary files /dev/null and b/logos/sports/NFL/New York Jets.png differ diff --git a/logos/sports/NFL/Oakland.png b/logos/sports/NFL/Oakland.png new file mode 100644 index 0000000..1e14b45 Binary files /dev/null and b/logos/sports/NFL/Oakland.png differ diff --git a/logos/sports/NFL/Philadelphia.png b/logos/sports/NFL/Philadelphia.png new file mode 100644 index 0000000..ae08f66 Binary files /dev/null and b/logos/sports/NFL/Philadelphia.png differ diff --git a/logos/sports/NFL/Pittsburgh.png b/logos/sports/NFL/Pittsburgh.png new file mode 100644 index 0000000..eb250d0 Binary files /dev/null and b/logos/sports/NFL/Pittsburgh.png differ diff --git a/logos/sports/NFL/San Francisco.png b/logos/sports/NFL/San Francisco.png new file mode 100644 index 0000000..1d6fa4b Binary files /dev/null and b/logos/sports/NFL/San Francisco.png differ diff --git a/logos/sports/NFL/Seattle.png b/logos/sports/NFL/Seattle.png new file mode 100644 index 0000000..2a6ed69 Binary files /dev/null and b/logos/sports/NFL/Seattle.png differ diff --git a/logos/sports/NFL/Tampa Bay.png b/logos/sports/NFL/Tampa Bay.png new file mode 100644 index 0000000..86f4c2c Binary files /dev/null and b/logos/sports/NFL/Tampa Bay.png differ diff --git a/logos/sports/NFL/Tennessee.png b/logos/sports/NFL/Tennessee.png new file mode 100644 index 0000000..ff00c1d Binary files /dev/null and b/logos/sports/NFL/Tennessee.png differ diff --git a/logos/sports/NFL/Washington.png b/logos/sports/NFL/Washington.png new file mode 100644 index 0000000..ceff856 Binary files /dev/null and b/logos/sports/NFL/Washington.png differ diff --git a/logos/sports/__MACOSX/NBA/._Atlanta.png b/logos/sports/__MACOSX/NBA/._Atlanta.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Atlanta.png differ diff --git a/logos/sports/__MACOSX/NBA/._Boston.png b/logos/sports/__MACOSX/NBA/._Boston.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Boston.png differ diff --git a/logos/sports/__MACOSX/NBA/._Brooklyn.png b/logos/sports/__MACOSX/NBA/._Brooklyn.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Brooklyn.png differ diff --git a/logos/sports/__MACOSX/NBA/._Charlotte.png b/logos/sports/__MACOSX/NBA/._Charlotte.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Charlotte.png differ diff --git a/logos/sports/__MACOSX/NBA/._Chicago.png b/logos/sports/__MACOSX/NBA/._Chicago.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Chicago.png differ diff --git a/logos/sports/__MACOSX/NBA/._Cleveland.png b/logos/sports/__MACOSX/NBA/._Cleveland.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Cleveland.png differ diff --git a/logos/sports/__MACOSX/NBA/._Dallas.png b/logos/sports/__MACOSX/NBA/._Dallas.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Dallas.png differ diff --git a/logos/sports/__MACOSX/NBA/._Denver.png b/logos/sports/__MACOSX/NBA/._Denver.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Denver.png differ diff --git a/logos/sports/__MACOSX/NBA/._Detroit.png b/logos/sports/__MACOSX/NBA/._Detroit.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Detroit.png differ diff --git a/logos/sports/__MACOSX/NBA/._Golden State.png b/logos/sports/__MACOSX/NBA/._Golden State.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Golden State.png differ diff --git a/logos/sports/__MACOSX/NBA/._Houston.png b/logos/sports/__MACOSX/NBA/._Houston.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Houston.png differ diff --git a/logos/sports/__MACOSX/NBA/._Indiana.png b/logos/sports/__MACOSX/NBA/._Indiana.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Indiana.png differ diff --git a/logos/sports/__MACOSX/NBA/._LA Lakers.png b/logos/sports/__MACOSX/NBA/._LA Lakers.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._LA Lakers.png differ diff --git a/logos/sports/__MACOSX/NBA/._LA.png b/logos/sports/__MACOSX/NBA/._LA.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._LA.png differ diff --git a/logos/sports/__MACOSX/NBA/._Memphis.png b/logos/sports/__MACOSX/NBA/._Memphis.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Memphis.png differ diff --git a/logos/sports/__MACOSX/NBA/._Miami.png b/logos/sports/__MACOSX/NBA/._Miami.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Miami.png differ diff --git a/logos/sports/__MACOSX/NBA/._Milwaukee.png b/logos/sports/__MACOSX/NBA/._Milwaukee.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Milwaukee.png differ diff --git a/logos/sports/__MACOSX/NBA/._Minnesota.png b/logos/sports/__MACOSX/NBA/._Minnesota.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Minnesota.png differ diff --git a/logos/sports/__MACOSX/NBA/._New Orleans.png b/logos/sports/__MACOSX/NBA/._New Orleans.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._New Orleans.png differ diff --git a/logos/sports/__MACOSX/NBA/._New York.png b/logos/sports/__MACOSX/NBA/._New York.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._New York.png differ diff --git a/logos/sports/__MACOSX/NBA/._Oklahoma City.png b/logos/sports/__MACOSX/NBA/._Oklahoma City.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Oklahoma City.png differ diff --git a/logos/sports/__MACOSX/NBA/._Orlando.png b/logos/sports/__MACOSX/NBA/._Orlando.png new file mode 100644 index 0000000..36676e9 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Orlando.png differ diff --git a/logos/sports/__MACOSX/NBA/._Philadelphia.png b/logos/sports/__MACOSX/NBA/._Philadelphia.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Philadelphia.png differ diff --git a/logos/sports/__MACOSX/NBA/._Phoenix.png b/logos/sports/__MACOSX/NBA/._Phoenix.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Phoenix.png differ diff --git a/logos/sports/__MACOSX/NBA/._Portland.png b/logos/sports/__MACOSX/NBA/._Portland.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Portland.png differ diff --git a/logos/sports/__MACOSX/NBA/._Sacramento.png b/logos/sports/__MACOSX/NBA/._Sacramento.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Sacramento.png differ diff --git a/logos/sports/__MACOSX/NBA/._San Antonio.png b/logos/sports/__MACOSX/NBA/._San Antonio.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._San Antonio.png differ diff --git a/logos/sports/__MACOSX/NBA/._Toronto.png b/logos/sports/__MACOSX/NBA/._Toronto.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Toronto.png differ diff --git a/logos/sports/__MACOSX/NBA/._Utah.png b/logos/sports/__MACOSX/NBA/._Utah.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Utah.png differ diff --git a/logos/sports/__MACOSX/NBA/._Washington.png b/logos/sports/__MACOSX/NBA/._Washington.png new file mode 100644 index 0000000..69fd4a2 Binary files /dev/null and b/logos/sports/__MACOSX/NBA/._Washington.png differ diff --git a/logos/sports/__MACOSX/NFL/._Arizona.png b/logos/sports/__MACOSX/NFL/._Arizona.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Arizona.png differ diff --git a/logos/sports/__MACOSX/NFL/._Atlanta.png b/logos/sports/__MACOSX/NFL/._Atlanta.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Atlanta.png differ diff --git a/logos/sports/__MACOSX/NFL/._Baltimore.png b/logos/sports/__MACOSX/NFL/._Baltimore.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Baltimore.png differ diff --git a/logos/sports/__MACOSX/NFL/._Buffalo.png b/logos/sports/__MACOSX/NFL/._Buffalo.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Buffalo.png differ diff --git a/logos/sports/__MACOSX/NFL/._Carolina.png b/logos/sports/__MACOSX/NFL/._Carolina.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Carolina.png differ diff --git a/logos/sports/__MACOSX/NFL/._Chicago.png b/logos/sports/__MACOSX/NFL/._Chicago.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Chicago.png differ diff --git a/logos/sports/__MACOSX/NFL/._Cincinnati.png b/logos/sports/__MACOSX/NFL/._Cincinnati.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Cincinnati.png differ diff --git a/logos/sports/__MACOSX/NFL/._Cleveland.png b/logos/sports/__MACOSX/NFL/._Cleveland.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Cleveland.png differ diff --git a/logos/sports/__MACOSX/NFL/._Dallas.png b/logos/sports/__MACOSX/NFL/._Dallas.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Dallas.png differ diff --git a/logos/sports/__MACOSX/NFL/._Denver.png b/logos/sports/__MACOSX/NFL/._Denver.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Denver.png differ diff --git a/logos/sports/__MACOSX/NFL/._Detroit.png b/logos/sports/__MACOSX/NFL/._Detroit.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Detroit.png differ diff --git a/logos/sports/__MACOSX/NFL/._Green Bay.png b/logos/sports/__MACOSX/NFL/._Green Bay.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Green Bay.png differ diff --git a/logos/sports/__MACOSX/NFL/._Houston.png b/logos/sports/__MACOSX/NFL/._Houston.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Houston.png differ diff --git a/logos/sports/__MACOSX/NFL/._Indianapolis.png b/logos/sports/__MACOSX/NFL/._Indianapolis.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Indianapolis.png differ diff --git a/logos/sports/__MACOSX/NFL/._Jacksonville.png b/logos/sports/__MACOSX/NFL/._Jacksonville.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Jacksonville.png differ diff --git a/logos/sports/__MACOSX/NFL/._Kansas City.png b/logos/sports/__MACOSX/NFL/._Kansas City.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Kansas City.png differ diff --git a/logos/sports/__MACOSX/NFL/._Los Angeles Chargers.png b/logos/sports/__MACOSX/NFL/._Los Angeles Chargers.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Los Angeles Chargers.png differ diff --git a/logos/sports/__MACOSX/NFL/._Los Angeles Rams.png b/logos/sports/__MACOSX/NFL/._Los Angeles Rams.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Los Angeles Rams.png differ diff --git a/logos/sports/__MACOSX/NFL/._Miami.png b/logos/sports/__MACOSX/NFL/._Miami.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Miami.png differ diff --git a/logos/sports/__MACOSX/NFL/._Minnesota.png b/logos/sports/__MACOSX/NFL/._Minnesota.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Minnesota.png differ diff --git a/logos/sports/__MACOSX/NFL/._New England.png b/logos/sports/__MACOSX/NFL/._New England.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._New England.png differ diff --git a/logos/sports/__MACOSX/NFL/._New Orleans.png b/logos/sports/__MACOSX/NFL/._New Orleans.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._New Orleans.png differ diff --git a/logos/sports/__MACOSX/NFL/._New York Giants.png b/logos/sports/__MACOSX/NFL/._New York Giants.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._New York Giants.png differ diff --git a/logos/sports/__MACOSX/NFL/._New York Jets.png b/logos/sports/__MACOSX/NFL/._New York Jets.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._New York Jets.png differ diff --git a/logos/sports/__MACOSX/NFL/._Oakland.png b/logos/sports/__MACOSX/NFL/._Oakland.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Oakland.png differ diff --git a/logos/sports/__MACOSX/NFL/._Philadelphia.png b/logos/sports/__MACOSX/NFL/._Philadelphia.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Philadelphia.png differ diff --git a/logos/sports/__MACOSX/NFL/._Pittsburgh.png b/logos/sports/__MACOSX/NFL/._Pittsburgh.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Pittsburgh.png differ diff --git a/logos/sports/__MACOSX/NFL/._San Francisco.png b/logos/sports/__MACOSX/NFL/._San Francisco.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._San Francisco.png differ diff --git a/logos/sports/__MACOSX/NFL/._Seattle.png b/logos/sports/__MACOSX/NFL/._Seattle.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Seattle.png differ diff --git a/logos/sports/__MACOSX/NFL/._Tampa Bay.png b/logos/sports/__MACOSX/NFL/._Tampa Bay.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Tampa Bay.png differ diff --git a/logos/sports/__MACOSX/NFL/._Tennessee.png b/logos/sports/__MACOSX/NFL/._Tennessee.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Tennessee.png differ diff --git a/logos/sports/__MACOSX/NFL/._Washington.png b/logos/sports/__MACOSX/NFL/._Washington.png new file mode 100644 index 0000000..9e171fb Binary files /dev/null and b/logos/sports/__MACOSX/NFL/._Washington.png differ diff --git a/server.py b/server.py index 4c5f75f..9fcc048 100644 --- a/server.py +++ b/server.py @@ -338,6 +338,11 @@ def matrix(): ticker.sendline('K') ticker.sendline('t') + elif "All" in request.form: + print('teams') + ticker.sendline('K') + ticker.sendline('A') + elif "Stop Display" in request.form: print('run display') diff --git a/setup.sh b/setup.sh index b8149af..98f9005 100755 --- a/setup.sh +++ b/setup.sh @@ -15,6 +15,7 @@ chmod ugo+rwx display_image.ppm chmod ugo+rwx weather.ppm chmod ugo+rwx teams.ppm chmod ugo+rwx league.ppm +chmod ugo+rwx full.ppm cd rpi-rgb-led-matrix sudo apt-get update && sudo apt-get install python3-dev python3-pillow -y diff --git a/stockTicker.py b/stockTicker.py index 8acad5b..7d363bb 100644 --- a/stockTicker.py +++ b/stockTicker.py @@ -20,7 +20,7 @@ from multiprocessing import Process import traceback import json from datetime import datetime - +import matplotlib.colors as mcolors def getInput(Block=False): if Block or select.select([sys.stdin], [], [], 0) == ([sys.stdin], [], []): @@ -236,7 +236,7 @@ class StockTicker(): if matrix_height: height = 32 - img = Image.new('RGB', (width + buff + 3, height+3)) + img = Image.new('RGB', (width + buff + 3, height+5)) d = ImageDraw.Draw(img) d.text((0, 0), text, fill=(r, g, b), font=font) @@ -583,6 +583,8 @@ class StockTicker(): finalDisplayImage.save('final.ppm') elif updated_img == 2: finalDisplayImage.save('final1.ppm') + + return finalDisplayImage def getLeagueImage(self, league, time): @@ -592,15 +594,15 @@ class StockTicker(): print(league_info[0].keys()) small_font = ImageFont.load("./fonts/5x7.pil") med_font = ImageFont.load("./fonts/7x14B.pil") - large_font = ImageFont.load("./fonts/10x20.pil") + large_font = ImageFont.load("./fonts/9x18B.pil") - if league =='NHL': # read the NHl info from the csv, prem will need this as well - sports_info = self.readSportsCSV(league) - + + sports_info = self.readSportsCSV(league) + print(sports_info) - buff_size = 20 + buff_size = 25 x_offset = 0 print(len(league_info)) @@ -617,29 +619,27 @@ class StockTicker(): try: - if league == 'NHL': - home_logo = Image.open('logos/sports/{}/{}'.format(league, sports_info[home_team]['logo'])) - elif league == 'premier_league': - home_logo = Image.open('logos/sports/{}/{}.png'.format(league, home_team)) - except: + + home_logo = Image.open('logos/sports/{}/{}'.format(league, sports_info[home_team]['logo'])) + + except Exception as e: home_logo = self.textImage(home_team.replace(' ', '\n'), small_font, r = 255, g = 255, b = 255) - print(home_team) + print(e) try: - if league == 'NHL': - away_logo = Image.open('logos/sports/{}/{}'.format(league, sports_info[away_team]['logo'])) - elif league == 'premier_league': - away_logo = Image.open('logos/sports/{}/{}.png'.format(league, away_team)) - except: + + away_logo = Image.open('logos/sports/{}/{}'.format(league, sports_info[away_team]['logo'])) + + except Exception as e: away_logo = self.textImage(away_team.replace(' ', '\n'), small_font, r = 255, g = 255, b = 255) - + print(e) #away_timage = self.textImage(sports_info[away_team]['code'], small_font, r = 255, g = 255, b = 255) - date_timage = self.textImage(date, small_font, r = 255, g = 255, b = 0) + date_timage = self.textImage(date, small_font, r = 255, g = 255, b = 255) #round_timage = self.textImage('round:' + rond, small_font, r = 255, g = 255, b = 255) @@ -648,18 +648,52 @@ class StockTicker(): img.paste(home_logo, (x_offset,0)) x_offset += home_logo.size[0] + 2 - img.paste(date_timage, (x_offset, 0)) + if time == 'future': - vs_timage = self.textImage(sports_info[home_team]['code'] + 'vs' + sports_info[away_team]['code'], med_font, r = 255, g = 255, b = 255) - img.paste(vs_timage, (x_offset, 12)) + img.paste(date_timage, (x_offset+5, 0)) + #vs_timage = self.textImage(sports_info[home_team]['code'] + 'vs' + sports_info[away_team]['code'], med_font, r = 255, g = 255, b = 255) + + #img.paste(vs_timage, (x_offset, 12)) + + h_colour = mcolors.to_rgb(sports_info[home_team]['colour'].replace(' ', '')) + + hc_timage = self.textImage(sports_info[home_team]['code'], med_font, r = int(h_colour[0]*255), g = int(h_colour[1]*255), b = int(h_colour[2]*255)) + + a_colour = mcolors.to_rgb(sports_info[away_team]['colour'].replace(' ', '')) + + ac_timage = self.textImage(sports_info[away_team]['code'], med_font, r = int(a_colour[0]*255), g = int(a_colour[1]*255), b = int(a_colour[2]*255)) + + vs_timage = self.textImage('vs', med_font, r = 255, g = 255, b = 255) + + img.paste(hc_timage, (x_offset, 9)) + img.paste(vs_timage, (x_offset + hc_timage.size[0], 9)) + img.paste(ac_timage, (x_offset + hc_timage.size[0] + vs_timage.size[0], 9)) else: + img.paste(date_timage, (x_offset+10, 0)) score_image = self.textImage(home_score + '-' + away_score, large_font, r = 255, g = 255, b = 255) - img.paste(score_image, (x_offset + 10, 15)) - vs_timage = self.textImage(sports_info[home_team]['code'] + 'vs' + sports_info[away_team]['code'], small_font, r = 255, g = 255, b = 255) - img.paste(vs_timage, (x_offset+4, 9)) + + #vs_timage = self.textImage(sports_info[home_team]['code'] + 'vs' + sports_info[away_team]['code'], small_font, r = 255, g = 255, b = 255) + + h_colour = mcolors.to_rgb(sports_info[home_team]['colour'].replace(' ', '')) + + hc_timage = self.textImage(sports_info[home_team]['code'], small_font, r = int(h_colour[0]*255), g = int(h_colour[1]*255), b = int(h_colour[2]*255)) + + a_colour = mcolors.to_rgb(sports_info[away_team]['colour'].replace(' ', '')) + + ac_timage = self.textImage(sports_info[away_team]['code'], small_font, r = int(a_colour[0]*255), g = int(a_colour[1]*255), b = int(a_colour[2]*255)) + + vs_timage = self.textImage('vs', small_font, r = 255, g = 255, b = 255) + + img.paste(hc_timage, (x_offset+14, 9)) + img.paste(vs_timage, (x_offset+13 + hc_timage.size[0], 9)) + img.paste(ac_timage, (x_offset+14 + hc_timage.size[0] + vs_timage.size[0], 9)) + + img.paste(score_image, (x_offset + 35 - int(score_image.size[0]/2), 15)) + + #img.paste(vs_timage, (x_offset+4, 9)) #if league == 'NHL': # @@ -670,14 +704,15 @@ class StockTicker(): #x_offset += max(home_timage.size[0], away_timage.size[0], date_timage.size[0], round_timage.size[0], score_image.size[0]) - if time == 'past': - x_offset += max( date_timage.size[0], vs_timage.size[0], score_image.size[0]) + if time == 'future': + x_offset += max( date_timage.size[0], hc_timage.size[0] + vs_timage.size[0] + ac_timage.size[0]) else: - x_offset += max( date_timage.size[0], vs_timage.size[0]) + + x_offset += max( date_timage.size[0]+10, hc_timage.size[0] + vs_timage.size[0] + ac_timage.size[0]+14, 35 + int(score_image.size[0]/2)) - img.paste(away_logo, (x_offset,0)) + img.paste(away_logo, (x_offset+2,0)) - x_offset += away_logo.size[0] + 2 + x_offset += away_logo.size[0] x_offset += buff_size img = img.crop((0,0,x_offset ,32)) @@ -737,10 +772,7 @@ class StockTicker(): return img - - - def getTodayWeatherImage(self): img = Image.new('RGB', (200, 32)) @@ -1216,8 +1248,8 @@ class StockTicker(): team_info[row[0]] = {} team_info[row[0]]['id'] = row[1] team_info[row[0]]['code'] = row[2] - team_info[row[0]]['logo'] = row[3] - team_info[row[0]]['colour'] = row[4] + team_info[row[0]]['logo'] = row[4] + team_info[row[0]]['colour'] = row[3] return team_info @@ -1313,7 +1345,7 @@ class StockTicker(): break elif msg == 'W': # weather - img = stock_ticker.getTodayWeatherImage() + img = self.getTodayWeatherImage() img.save('weather.ppm') self.scrollImageTransition(['weather.ppm', 'weather.ppm'], stocks = False) @@ -1326,19 +1358,19 @@ class StockTicker(): self.scrollImageTransition(['weather.ppm', 'weather.ppm'], stocks = False) elif msg == 'P': # past league - img = self.getLeagueImage('NHL', 'past') + img = self.getLeagueImage('premier_league', 'past') img.save('league.ppm') stock_ticker.scrollImageTransition(['league.ppm', 'league.ppm'], stocks = False) elif msg == 'F': # future league - img = self.getLeagueImage('NHL', 'future') + img = self.getLeagueImage('NBA', 'future') img.save('league.ppm') stock_ticker.scrollImageTransition(['league.ppm', 'league.ppm'], stocks = False) elif msg == 'L': # live game - img = self.getLeagueImage('NHL', 'live') + img = self.getLeagueImage('NBA', 'live') img.save('league.ppm') stock_ticker.scrollImageTransition(['league.ppm', 'league.ppm'], stocks = False) @@ -1349,6 +1381,15 @@ class StockTicker(): stock_ticker.scrollImageTransition(['teams.ppm', 'teams.ppm'], stocks = False) + elif msg == 'A': #everything + stock_img = self.getFullStockImage(1) + weather_img = self.getTodayWeatherImage() + past_img = self.getLeagueImage('NBA', 'past') + future_img = img = self.getLeagueImage('NBA', 'future') + + overall_img = self.stitchImage([stock_img, weather_img, past_img, future_img]) + overall_img.save('full.ppm') + self.scrollImageTransition(['full.ppm', 'full.ppm'], stocks = False) elif msg == 'K': # kill self.resetMatrix() @@ -1357,8 +1398,7 @@ if __name__ == '__main__': with open('log.txt', "w") as log: try: - stock_ticker = StockTicker() - #stock_ticker.process_msg('L') + diff --git a/templates/index.html b/templates/index.html index f69a542..38628f7 100644 --- a/templates/index.html +++ b/templates/index.html @@ -18,6 +18,7 @@ +