diff --git a/csv/crypto.csv b/csv/crypto.csv index 2bf1c78..8afb6ff 100644 --- a/csv/crypto.csv +++ b/csv/crypto.csv @@ -1,4 +1,4 @@ symbol,name,base,current,24hr change -BTC,bitcoin,usd,31305,-2.0998034214379917 -ETH,ethereum,gbp,1348.38,-3.2230690088174447 -DOGE,dogecoin,usd,0.179552,-5.981357712437481 +BTC,bitcoin,usd,31363,-1.3997435288701887 +ETH,ethereum,gbp,1352.07,-2.266523397486414 +DOGE,dogecoin,usd,0.181538,-4.553254701438885 diff --git a/csv/current_weather.json b/csv/current_weather.json index 253406b..21ca5dc 100644 --- a/csv/current_weather.json +++ b/csv/current_weather.json @@ -1 +1 @@ -[{"main_weather": "Clouds", "description": "broken clouds", "temp": 29.4, "min_temp": 28.44, "max_temp": 30.37, "feels_like": 36.37, "humidity": 82, "clouds": 67, "wind_speed": 0.45, "wind_direction": 33, "visibility": 10000, "uv": 0, "rain_chance": 0.2}, {"main_weather": "Clear", "description": "clear sky", "temp": 21.98, "min_temp": 12.13, "max_temp": 25.11, "feels_like": 21.67, "humidity": 55, "clouds": 0, "wind_speed": 3.09, "wind_direction": 340, "visibility": 10000, "uv": 7.13, "rain_chance": 0}] \ No newline at end of file +[{"main_weather": "Rain", "description": "light rain", "temp": 29.25, "min_temp": 28.44, "max_temp": 30.37, "feels_like": 36.16, "humidity": 83, "clouds": 67, "wind_speed": 0.45, "wind_direction": 43, "visibility": 10000, "uv": 0, "rain_chance": 0.2}, {"main_weather": "Clear", "description": "clear sky", "temp": 22.41, "min_temp": 12.13, "max_temp": 25.11, "feels_like": 22.09, "humidity": 53, "clouds": 0, "wind_speed": 3.09, "wind_direction": 340, "visibility": 10000, "uv": 7.13, "rain_chance": 0}] \ No newline at end of file diff --git a/csv/last_updates.json b/csv/last_updates.json index 6ef88b8..1e1ab8a 100644 --- a/csv/last_updates.json +++ b/csv/last_updates.json @@ -1 +1 @@ -{"stocks": "16/07/2021 06:37:08", "crypto": "16/07/2021 06:37:10", "news": "16/07/2021 06:37:11", "weather": "16/07/2021 06:37:10", "forex": "16/07/2021 12:37:14", "sports": "16/07/2021 06:37:12"} \ No newline at end of file +{"stocks": "16/07/2021 06:50:18", "crypto": "16/07/2021 06:50:20", "news": "16/07/2021 06:50:22", "weather": "16/07/2021 06:50:21", "forex": "16/07/2021 12:50:24", "sports": "16/07/2021 06:50:22"} \ No newline at end of file diff --git a/stockTicker.py b/stockTicker.py index bb0f1da..f2a3d7b 100644 --- a/stockTicker.py +++ b/stockTicker.py @@ -1030,17 +1030,17 @@ class StockTicker(): logo = logo.resize((int(width/2), int(height/2))) - img = Image.new('RGB', (headline_img.size[0]+ source_img.size[0] + logo.size[0], 32)) - img.paste(headline_img, (source_img.size[0]+ 5, 3)) + img = Image.new('RGB', (headline_img.size[0]+ source_img.size[0] + logo.size[0] +5, 32)) + img.paste(headline_img, (source_img.size[0]+ + logo.size[0] +5, 3)) img.paste(source_img, (2,3)) img= self.stitchImage([logo,img]) except Exception as e: - img = Image.new('RGB', (headline_img.size[0] + source_img.size[0], 32)) - img.paste(headline_img, (0,0)) - img.paste(source_img, (0,16)) + img = Image.new('RGB', (headline_img.size[0] + source_img.size[0] +5, 32)) + img.paste(headline_img, (source_img.size[0]+ 5, 3)) + img.paste(source_img, (2,3)) image_list.append(img) image_list.append(blank)