c0de/fintic-tracker
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

weather order fixed

Browse Source
This commit is contained in:
Neythen Treloar 2022-03-07 17:05:54 +00:00
parent 65d41086a8
commit e5784af50f
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
database_caller.py
View File

@ -283,14 +283,15 @@ def updateWeather(api_key, logf):
current_locations = list(all_current_settings['locations'].keys()) current_locations = list(all_current_settings['locations'].keys())
daily_locations = list(all_daily_settings['locations'].keys()) daily_locations = list(all_daily_settings['locations'].keys())
print(current_locations, daily_locations)
all_locations = list(set(current_locations + daily_locations)) all_locations = list(set(current_locations + daily_locations))
print(all_locations)
current_weathers = {} currents = []
daily_weathers = {} dailys = []
for location in all_locations: for location in all_locations:
@ -319,8 +320,7 @@ def updateWeather(api_key, logf):
current_weather['rain_chance'] = r.json()['hourly'][0]['pop'] current_weather['rain_chance'] = r.json()['hourly'][0]['pop']
if location in current_locations: currents.append(current_weather)
current_weathers[location] = current_weather
daily_weather = [] daily_weather = []
daily = r.json()['daily'] daily = r.json()['daily']
@ -344,8 +344,24 @@ def updateWeather(api_key, logf):
daily_weather[0]['wind_direction'] = current_weather['wind_direction'] daily_weather[0]['wind_direction'] = current_weather['wind_direction']
daily_weather[0]['visibility'] = current_weather['visibility'] daily_weather[0]['visibility'] = current_weather['visibility']
if location in daily_locations: dailys.append(daily_weather)
daily_weathers[location] = daily_weather
current_weathers = {}
daily_weathers = {}
for l in current_locations:
for i,loc in enumerate(all_locations):
if l == loc:
current_weathers[location] = currents[i]
for l in daily_locations:
for i,loc in enumerate(all_locations):
if l == loc:
daily_weathers[location] = dailys[i]
@ -773,7 +789,8 @@ if __name__ == '__main__':
except Exception as e: except Exception as e:
print(e)
raise e
exc_type, exc_obj, exc_tb = sys.exc_info() exc_type, exc_obj, exc_tb = sys.exc_info()
fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1] fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
logf.write(str(e)) logf.write(str(e))

6
stockTicker.py
View File

@ -1209,7 +1209,7 @@ class StockTicker():
except Exception as e: except Exception as e:
print(e) print(e)
raise e #raise e
exc_type, exc_obj, exc_tb = sys.exc_info() exc_type, exc_obj, exc_tb = sys.exc_info()
fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1] fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
self.logf.write(str(e)) self.logf.write(str(e))
@ -2769,7 +2769,7 @@ if __name__ == '__main__':
#stock_ticker.process_msg('-') #stock_ticker.process_msg('-')
#stock_ticker.process_msg('W') #stock_ticker.process_msg('W')
stock_ticker.process_msg('A') #stock_ticker.process_msg('A')
@ -2778,7 +2778,7 @@ if __name__ == '__main__':
stock_ticker.process_msg(msg) stock_ticker.process_msg(msg)
except Exception as e: except Exception as e:
print(e) print(e)
raise e
exc_type, exc_obj, exc_tb = sys.exc_info() exc_type, exc_obj, exc_tb = sys.exc_info()
fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1] fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
log.write(str(e)) log.write(str(e))