iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use common config instead of hardcoded config

Browse Source 
units, hour_format and language will be automatically set for each module
This commit is contained in:
Ace
2020-06-19 19:40:50 +02:00
parent 74622a2c21
commit 8e09731c13
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inkycal/modules/inkycal_weather.py
View File

@@ -43,8 +43,8 @@ class Weather(inkycal_module):
# module specific parameters
self.owm = pyowm.OWM(self.config['api_key'])
self.units = 'metric' # metric # imperial
self.hour_format = '24' # 12 #24
self.units = self.config['units']
self.hour_format = self.config['hours']
self.timezone = get_system_tz()
self.round_temperature = True
self.round_windspeed = True
@@ -278,7 +278,7 @@ class Weather(inkycal_module):
'temp':temp,
'icon':icon,
'stamp': forecast_timings[forecasts.index(forecast)].format('H.00'
if self.hour_format == '24' else 'h a')
if self.hour_format == 24 else 'h a')
}
elif self.forecast_interval == 'daily':
@@ -335,10 +335,10 @@ class Weather(inkycal_module):
sunrise_raw = arrow.get(weather.get_sunrise_time()).to(self.timezone)
sunset_raw = arrow.get(weather.get_sunset_time()).to(self.timezone)
if self.hour_format == '12':
if self.hour_format == 12:
sunrise = sunrise_raw.format('h:mm a')
sunset = sunset_raw.format('h:mm a')
elif self.hour_format == '24':
elif self.hour_format == 24:
sunrise = sunrise_raw.format('H:mm')
sunset = sunset_raw.format('H:mm')