diff --git a/csv/crypto.csv b/csv/crypto.csv index a02d997..eb4a213 100644 --- a/csv/crypto.csv +++ b/csv/crypto.csv @@ -1,3 +1,3 @@ symbol,name,base,current,24hr change -BTC,bitcoin,usd,32687,-5.959078724239707 -ETH,ethereum,gbp,1419.67,-7.467260572537722 +BTC,bitcoin,usd,32709,-5.776193166295658 +ETH,ethereum,gbp,1419.48,-7.468105883111548 diff --git a/csv/current_weather.json b/csv/current_weather.json index 2d1a69e..5ebf130 100644 --- a/csv/current_weather.json +++ b/csv/current_weather.json @@ -1 +1 @@ -{"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 +{"main_weather": "Clouds", "description": "overcast clouds", "temp": 29.78, "min_temp": 27.98, "max_temp": 30.21, "feels_like": 36.78, "humidity": 88, "clouds": 100, "wind_speed": 0.89, "wind_direction": 278, "visibility": 10000, "uv": 0, "rain_chance": 0.74} \ No newline at end of file diff --git a/csv/last_update.csv b/csv/last_update.csv index 0c796ce..4b1479d 100644 --- a/csv/last_update.csv +++ b/csv/last_update.csv @@ -1 +1 @@ -21/06/2021 12:36:08 +21/06/2021 12:41:07 diff --git a/csv/tickers.csv b/csv/tickers.csv index 0ef83c2..5699afb 100644 --- a/csv/tickers.csv +++ b/csv/tickers.csv @@ -1,4 +1,4 @@ name,current,opening -MSFT,262.3758,259.82 -NFLX,494.8007,501.64 -GOOG,2530.35,2514.8 +MSFT,262.3,259.82 +NFLX,495.166,501.64 +GOOG,2529.965,2514.8 diff --git a/final.ppm b/final.ppm index d2f0375..66a9adc 100755 Binary files a/final.ppm and b/final.ppm differ diff --git a/full.ppm b/full.ppm index e51f3a9..0c155a2 100755 Binary files a/full.ppm and b/full.ppm differ diff --git a/log.txt b/log.txt index 70b5fcd..e69de29 100755 --- a/log.txt +++ b/log.txt @@ -1,9 +0,0 @@ -'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/server.py b/server.py index 9fcc048..606678d 100644 --- a/server.py +++ b/server.py @@ -37,7 +37,7 @@ ALLOWED_EXTENSIONS = {'csv', 'png'} #time.sleep(10) # let api calls finish ticker = pexpect.spawn("sudo -E python3 stockTicker.py") -ticker.sendline('S') # run by default +ticker.sendline('A') # run by default #stock_ticker = StockTicker() def allowed_file(filename): diff --git a/stockTicker.py b/stockTicker.py index 7d363bb..bc2403a 100644 --- a/stockTicker.py +++ b/stockTicker.py @@ -599,7 +599,7 @@ class StockTicker(): sports_info = self.readSportsCSV(league) - print(sports_info) + buff_size = 25 @@ -1398,7 +1398,8 @@ if __name__ == '__main__': with open('log.txt', "w") as log: try: - + stock_ticker = StockTicker() +