X-Git-Url: https://yuggoth.org/gitweb?a=blobdiff_plain;f=weather.py;h=90f155cb442d2c6d881e7b62bfe98b185ae7fa9c;hb=5b44af7beca9731ab0b3b44506068606a7b1a628;hp=17a0e12a7493552e0538ce1f7e4e7c78d67c7cbe;hpb=cb9c9cf74be0d3b42b5cb1f5818f40560e23091b;p=weather.git

diff --git a/weather.py b/weather.py
index 17a0e12..90f155c 100644
--- a/weather.py
+++ b/weather.py
@@ -336,31 +336,26 @@ def get_alert(
     if alert:
         if verbose: return alert
         else:
-            if alert.find("\nNATIONAL WEATHER SERVICE") == -1:
-                muted = False
-            else:
+            import re
+            if re.search(r"\nNational Weather Service", alert):
                 muted = True
+            else:
+                muted = False
+            expirycheck = re.search(r"Expires:([0-9]{12})", alert)
+            if expirycheck:
+                # only report alerts and forecasts that expired less than
+                # offset ago
+                import datetime, zoneinfo
+                expiration = datetime.datetime.fromisoformat(
+                    "%sT%sZ" % (expirycheck[1][:8], expirycheck[1][-4:]))
+                now = datetime.datetime.now(tz=zoneinfo.ZoneInfo("UTC"))
+                # TODO: make this offset configurable
+                if now - expiration > datetime.timedelta(hours=1):
+                    return ""
             lines = alert.split("\n")
-            import time
-            # TODO: make this offset configurable
-            # TODO: adjust offset relative to the difference between the user's
-            #       local time and the zone's local time (will need to extend
-            #       the schema in the zones file to store each tz
-            offset = 86400  # one day
-
-            # report alerts and forecasts that expired less than offset ago;
-            # this is a cheap hack since expiration times seem to be relative
-            # to the zone's local time zone, and converting from the user's
-            # would get complicated, but also there can sometimes be a lag
-            # between expiration and the next update
-            valid_time = time.strftime(
-                "%Y%m%d%H%M", time.localtime(time.time() - offset))
             output = []
             for line in lines:
-                if line.startswith("Expires:") \
-                    and "Expires:" + valid_time > line:
-                    return ""
-                if muted and line.startswith("NATIONAL WEATHER SERVICE"):
+                if muted and line.startswith("National Weather Service"):
                     muted = False
                     line = ""
                 elif line == "&&":
@@ -1239,7 +1234,7 @@ def gecos(formatted):
     return tuple(coordinates)
 
 def correlate():
-    import codecs, csv, datetime, hashlib, os, re, sys, time, zipfile
+    import codecs, csv, datetime, hashlib, os, re, sys, time, zipfile, zoneinfo
     if pyversion("3"): import configparser
     else: import ConfigParser as configparser
     for filename in os.listdir("."):
@@ -2138,6 +2133,7 @@ def correlate():
             zctas_nocentroid += 1
     zones_nocentroid = 0
     zones_nodescription = 0
+    zones_notz = 0
     zones_noforecast = 0
     zones_overlapping = 0
     zonetable = {}
@@ -2165,6 +2161,10 @@ def correlate():
         if not zones.has_option(zone, "description"):
             qalog.append("%s: no description\n" % zone)
             zones_nodescription += 1
+        if not zones.has_option(zone, "tz") or not zones.get(
+                zone, "tz") in zoneinfo.available_timezones():
+            qalog.append("%s: no time zone\n" % zone)
+            zones_notz += 1
         if not zones.has_option(zone, "zone_forecast"):
             qalog.append("%s: no forecast\n" % zone)
             zones_noforecast += 1
@@ -2201,6 +2201,8 @@ def correlate():
             print("   %s zones with no centroid"%zones_nocentroid)
         if zones_nodescription:
             print("   %s zones with no description"%zones_nodescription)
+        if zones_notz:
+            print("   %s zones with no time zone"%zones_notz)
         if zones_noforecast:
             print("   %s zones with no forecast"%zones_noforecast)
         if zones_overlapping: