From 2bb08f9cef428b7e7ac9864eea30a74984aea693 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 6 Jun 2022 12:55:34 +0200 Subject: [PATCH] l radio: add probability of precipitation --- lass/2configs/radio/news.nix | 1 + lass/2configs/radio/weather_for_ips.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index aa10ea291..99b58511d 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -2,6 +2,7 @@ let weather_for_ips = pkgs.writers.writePython3Bin "weather_for_ips" { libraries = [ pkgs.python3Packages.geoip2 ]; + flakeIgnore = [ "E501" ]; } ./weather_for_ips.py; weather_report = pkgs.writers.writeDashBin "weather_report" '' diff --git a/lass/2configs/radio/weather_for_ips.py b/lass/2configs/radio/weather_for_ips.py index 8d9a2e7bc..213e69d3e 100644 --- a/lass/2configs/radio/weather_for_ips.py +++ b/lass/2configs/radio/weather_for_ips.py @@ -21,13 +21,13 @@ for ip in fileinput.input(): f'&units=metric' ) resp = requests.get(url) - weather = json.loads(resp.text)['current'] + weather = json.loads(resp.text) output.append( - f'Weather report for {location.city.name}' - f', {location.country.name}. ' - f'Currently it is {weather["weather"][0]["description"]} outside ' - f'with a temperature of {weather["temp"]} degrees ' - f'and a windspeed of {weather["wind_speed"]} meter per second. ' + f'Weather report for {location.city.name}, {location.country.name}. ' + f'Currently it is {weather["current"]["weather"][0]["description"]} outside ' + f'with a temperature of {weather["current"]["temp"]} degrees, ' + f'and a windspeed of {weather["current"]["wind_speed"]} meter per second. ' + f'The probability of precipitation is {weather["hourly"][0]["pop"] * 100} percent. ' ) print('\n'.join(output))