Merge remote-tracking branch 'lass/master' into 22.05

4 files changed, 76 insertions, 42 deletions

diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix
index 0611be7ce..b8d958865 100644
--- a/lass/2configs/radio/default.nix
+++ b/lass/2configs/radio/default.nix
@@ -107,6 +107,7 @@ let
 in {
   imports = [
     ./news.nix
+    ./weather.nix
   ];
 
   users.users = {
@@ -165,14 +166,14 @@ in {
 
     output.icecast(mount = '/music.ogg', password = 'hackme', %vorbis(quality = 1), source)
     output.icecast(mount = '/music.mp3', password = 'hackme', %mp3.vbr(), source)
-    output.icecast(mount = '/music.opus', password = 'hackme', %opus(bitrate = 64), source)
+    output.icecast(mount = '/music.opus', password = 'hackme', %opus(bitrate = 96), source)
 
     extra_input = audio_to_stereo(input.harbor("live", port=1338))
 
     o = smooth_add(normal = source, special = extra_input)
     output.icecast(mount = '/radio.ogg', password = 'hackme', %vorbis(quality = 1), o)
     output.icecast(mount = '/radio.mp3', password = 'hackme', %mp3.vbr(), o)
-    output.icecast(mount = '/radio.opus', password = 'hackme', %opus(bitrate = 64), o)
+    output.icecast(mount = '/radio.opus', password = 'hackme', %opus(bitrate = 96), o)
   '';
   services.icecast = {
     enable = true;
diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix
index 27b124093..e5b5405ff 100644
--- a/lass/2configs/radio/news.nix
+++ b/lass/2configs/radio/news.nix
@@ -1,45 +1,28 @@
 { config, lib, pkgs, ... }:
 let
-  weather_for_ips = pkgs.writers.writePython3Bin "weather_for_ips" {
-    libraries = [ pkgs.python3Packages.geoip2 ];
-  } ./weather_for_ips.py;
-
-  weather_report = pkgs.writers.writeDashBin "weather_report" ''
-    set -efu
-    export PATH="${lib.makeBinPath [
-      pkgs.coreutils
-      pkgs.curl
-      pkgs.iproute2
-      pkgs.jc
-      pkgs.jq
-    ]}"
-    curl -z /tmp/GeoLite2-City.mmdb -o /tmp/GeoLite2-City.mmdb http://c.r/GeoLite2-City.mmdb
-    MAXMIND_GEOIP_DB="/tmp/GeoLite2-City.mmdb"; export MAXMIND_GEOIP_DB
-    OPENWEATHER_API_KEY=$(cat "$CREDENTIALS_DIRECTORY/openweather_api"); export OPENWEATHER_API_KEY
-    ss -no 'sport = :8000' |
-      jc --ss | jq -r '.[] |
-        select(
-          .local_address != "[::ffff:127.0.0.1]"
-          and .local_address != "[::1]"
-        ) | .peer_address | gsub("[\\[\\]]"; "")
-      ' |
-      ${weather_for_ips}/bin/weather_for_ips
-  '';
 
   send_to_radio = pkgs.writers.writeDashBin "send_to_radio" ''
-    ${pkgs.vorbisTools}/bin/oggenc - |
+    ${pkgs.vorbis-tools}/bin/oggenc - |
       ${pkgs.libshout}/bin/shout --format ogg --host localhost --port 1338 --mount /live
   '';
 
   gc_news = pkgs.writers.writeDashBin "gc_news" ''
     set -xefu
+    export TZ=UTC #workaround for jq parsing wrong timestamp
     ${pkgs.coreutils}/bin/cat $HOME/news | ${pkgs.jq}/bin/jq -cs 'map(select((.to|fromdateiso8601) > now)) | .[]' > $HOME/bla-news.tmp
     ${pkgs.coreutils}/bin/mv $HOME/bla-news.tmp $HOME/news
   '';
 
   get_current_news = pkgs.writers.writeDashBin "get_current_news" ''
     set -xefu
-    ${pkgs.coreutils}/bin/cat $HOME/news | ${pkgs.jq}/bin/jq -rs 'map(select(((.to | fromdateiso8601) > now) and (.from|fromdateiso8601) < now) | .text) | .[]'
+    export TZ=UTC #workaround for jq parsing wrong timestamp
+    ${pkgs.coreutils}/bin/cat $HOME/news | ${pkgs.jq}/bin/jq -rs '
+      sort_by(.priority) |
+      map(select(
+        ((.to | fromdateiso8601) > now) and
+        (.from|fromdateiso8601) < now) |
+        .text
+      ) | .[]'
   '';
 
   newsshow = pkgs.writers.writeDashBin "newsshow" /* sh */ ''
@@ -50,7 +33,6 @@ let
     todays news:
     $(get_current_news)
     $(gc_news)
-    $(weather_report)
     EOF
   '';
 in
@@ -61,7 +43,6 @@ in
       send_to_radio
       gc_news
       get_current_news
-      weather_report
       pkgs.curl
       pkgs.retry
     ];
@@ -74,9 +55,6 @@ in
     startAt = "*:00:00";
     serviceConfig = {
       User = "radio-news";
-      LoadCredential = [
-        "openweather_api:${toString <secrets>}/openweather_api_key"
-      ];
     };
   };
 
@@ -107,8 +85,8 @@ in
         ;;
         "POST /")
           payload=$(head -c "$req_content_length")
-          echo "$payload" | jq 'has("from") and has("to") and has("text")' >&2
-          echo "$payload" | jq -c '{ from: (.from | fromdate | todate), to: (.to | fromdate | todate), text: .text }' >> "$HOME"/news
+          printf '%s' "$payload" | jq 'has("from") and has("to") and has("text")' >&2
+          printf '%s' "$payload" | jq -c '{ from: .from, to: .to, text: .text, priority: (.priority // 0)}' >> "$HOME"/news
           printf 'HTTP/1.1 200 OK\r\n'
           printf 'Connection: close\r\n'
           printf '\r\n'
diff --git a/lass/2configs/radio/weather.nix b/lass/2configs/radio/weather.nix
new file mode 100644
index 000000000..3beac6693
--- /dev/null
+++ b/lass/2configs/radio/weather.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs, ... }:
+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" ''
+    set -efu
+    export PATH="${lib.makeBinPath [
+      pkgs.coreutils
+      pkgs.curl
+      pkgs.iproute2
+      pkgs.jc
+      pkgs.jq
+    ]}"
+    curl -z /tmp/GeoLite2-City.mmdb -o /tmp/GeoLite2-City.mmdb http://c.r/GeoLite2-City.mmdb
+    MAXMIND_GEOIP_DB="/tmp/GeoLite2-City.mmdb"; export MAXMIND_GEOIP_DB
+    OPENWEATHER_API_KEY=$(cat "$CREDENTIALS_DIRECTORY/openweather_api"); export OPENWEATHER_API_KEY
+    ss -no 'sport = :8000' |
+      jc --ss | jq -r '.[] |
+        select(
+          .local_address != "[::ffff:127.0.0.1]"
+          and .local_address != "[::1]"
+        ) | .peer_address | gsub("[\\[\\]]"; "")
+      ' |
+      ${weather_for_ips}/bin/weather_for_ips
+  '';
+in {
+  systemd.services.weather = {
+    path = [
+      weather_report
+      pkgs.retry
+      pkgs.jq
+      pkgs.curl
+    ];
+    script = ''
+      set -xefu
+      retry -t 5 -d 10 -- weather_report |
+        jq \
+          --arg from "$(date -u +'%FT%TZ')" \
+          --arg to "$(date -u +'%FT%TZ' -d '+1 hours')" \
+          --slurp --raw-input --compact-output --ascii-output \
+          '{text: ., from: $from, to: $to, priority: 100}' |
+        retry -t 5 -d 10 -- curl -v -d@- http://radio-news.r
+    '';
+    startAt = "*:58:00";
+    serviceConfig = {
+      User = "radio-news";
+      LoadCredential = [
+        "openweather_api:${toString <secrets>}/openweather_api_key"
+      ];
+    };
+  };
+}
diff --git a/lass/2configs/radio/weather_for_ips.py b/lass/2configs/radio/weather_for_ips.py
index 8d9a2e7bc..f7cc2dace 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 wind speed of {weather["current"]["wind_speed"]} meters per second. '
+            f'The probability of precipitation is {weather["hourly"][0]["pop"] * 100} percent. '
         )
 
 print('\n'.join(output))