"""Contains various object definitions needed by the weather utility."""
weather_copyright = """\
-# Copyright (c) 2006-2021 Jeremy Stanley <fungi@yuggoth.org>. Permission to
+# Copyright (c) 2006-2024 Jeremy Stanley <fungi@yuggoth.org>. Permission to
# use, copy, modify, and distribute this software is granted under terms
# provided in the LICENSE file distributed with this software.
#"""
-weather_version = "2.4.1"
+weather_version = "2.4.4"
radian_to_km = 6372.795484
radian_to_mi = 3959.871528
# filter lines with both pressures in the form of "X inches (Y hPa)" or
# "X in. Hg (Y hPa)"
dual_p = re.match(
- "(.* )(\d*(\.\d+)? (inches|in\. Hg)) \((\d*(\.\d+)? hPa)\)(.*)",
+ r"(.* )(\d*(\.\d+)? (inches|in\. Hg)) \((\d*(\.\d+)? hPa)\)(.*)",
line
)
if dual_p:
elif units == "metric": line = preamble + hpa + trailer
# filter lines with both temperatures in the form of "X F (Y C)"
dual_t = re.match(
- "(.* )(-?\d*(\.\d+)? F) \((-?\d*(\.\d+)? C)\)(.*)",
+ r"(.* )(-?\d*(\.\d+)? F) \((-?\d*(\.\d+)? C)\)(.*)",
line
)
if dual_t:
# "Y kilometer(s)"
if units == "metric":
imperial_d = re.match(
- "(.* )(\d+)( mile\(s\))(.*)",
+ r"(.* )(\d+)( mile\(s\))(.*)",
line
)
if imperial_d:
# filter speeds in the form of "X MPH (Y KT)" to just "X MPH"; if metric is
# desired, convert to "Z KPH"
imperial_s = re.match(
- "(.* )(\d+)( MPH)( \(\d+ KT\))(.*)",
+ r"(.* )(\d+)( MPH)( \(\d+ KT\))(.*)",
line
)
if imperial_s:
line = preamble + str(int(round(int(mph)*1.609344))) + " KPH" + \
trailer
imperial_s = re.match(
- "(.* )(\d+)( MPH)( \(\d+ KT\))(.*)",
+ r"(.* )(\d+)( MPH)( \(\d+ KT\))(.*)",
line
)
if imperial_s:
# if imperial is desired, qualify given forcast temperatures like "X F"; if
# metric is desired, convert to "Y C"
imperial_t = re.match(
- "(.* )(High |high |Low |low )(\d+)(\.|,)(.*)",
+ r"(.* )(High |high |Low |low )(\d+)(\.|,)(.*)",
line
)
if imperial_t:
muted = True
lines = alert.split("\n")
import time
- valid_time = time.strftime("%Y%m%d%H%M")
+ # 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 timezone, 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:") \
"weatherrc"
]
for rcfile in rcfiles:
- if os.access(rcfile, os.R_OK): config.read(rcfile)
+ if os.access(rcfile, os.R_OK):
+ if pyversion("3"):
+ config.read(rcfile, encoding="utf-8")
+ else:
+ config.read(rcfile)
for section in config.sections():
if section != section.lower():
if config.has_section(section.lower()):
pass
return config
scache = configparser.ConfigParser()
- scache.read(scache_fn)
+ if pyversion("3"):
+ scache.read(scache_fn, encoding="utf-8")
+ else:
+ scache.read(scache_fn)
for section in scache.sections():
if not config.has_section(section):
config.add_section(section)
if pyversion("3"):
stations.read_string(
gzip.open(datafile).read().decode("utf-8") )
- else: stations.readfp( gzip.open(datafile) )
+ else: stations.read_file( gzip.open(datafile) )
else:
- stations.read(datafile)
+ if pyversion("3"):
+ stations.read(datafile, encoding="utf-8")
+ else:
+ stations.read(datafile)
else:
message = "%s error: can't find \"%s\" data file\n" % (
os.path.basename( sys.argv[0] ),
import gzip
if pyversion("3"):
zones.read_string( gzip.open(datafile).read().decode("utf-8") )
- else: zones.readfp( gzip.open(datafile) )
+ else: zones.read_file( gzip.open(datafile) )
else:
- zones.read(datafile)
+ if pyversion("3"):
+ zones.read(datafile, encoding="utf-8")
+ else:
+ zones.read(datafile)
else:
message = "%s error: can't find \"%s\" data file\n" % (
os.path.basename( sys.argv[0] ),
if pyversion("3"):
airports.read_string(
gzip.open(datafile).read().decode("utf-8") )
- else: airports.readfp( gzip.open(datafile) )
+ else: airports.read_file( gzip.open(datafile) )
else:
- airports.read(datafile)
+ if pyversion("3"):
+ airports.read(datafile, encoding="utf-8")
+ else:
+ airports.read(datafile)
else:
message = "%s error: can't find \"%s\" data file\n" % (
os.path.basename( sys.argv[0] ),
if pyversion("3"):
zctas.read_string(
gzip.open(datafile).read().decode("utf-8") )
- else: zctas.readfp( gzip.open(datafile) )
+ else: zctas.read_file( gzip.open(datafile) )
else:
- zctas.read(datafile)
+ if pyversion("3"):
+ zctas.read(datafile, encoding="utf-8")
+ else:
+ zctas.read(datafile)
else:
message = "%s error: can't find \"%s\" data file\n" % (
os.path.basename( sys.argv[0] ),
if pyversion("3"):
places.read_string(
gzip.open(datafile).read().decode("utf-8") )
- else: places.readfp( gzip.open(datafile) )
+ else: places.read_file( gzip.open(datafile) )
else:
- places.read(datafile)
+ if pyversion("3"):
+ places.read(datafile, encoding="utf-8")
+ else:
+ places.read(datafile)
else:
message = "%s error: can't find \"%s\" data file\n" % (
os.path.basename( sys.argv[0] ),
)
try:
scache_existing = configparser.ConfigParser()
- scache_existing.read(scache_fn)
+ if pyversion("3"):
+ scache_existing.read(scache_fn, encoding="utf-8")
+ else:
+ scache_existing.read(scache_fn)
if not scache_existing.has_section(search[0]):
scache_fd = codecs.open(scache_fn, "a", "utf-8")
scache_fd.writelines(search_cache)
return tuple(coordinates)
def correlate():
- import codecs, csv, datetime, hashlib, os, re, sys, tarfile, time, zipfile
+ import codecs, csv, datetime, hashlib, os, re, sys, time, zipfile
if pyversion("3"): import configparser
else: import ConfigParser as configparser
for filename in os.listdir("."):
sys.stdout.write(message)
sys.stdout.flush()
count = 0
- slist = codecs.open(slist_fn, "rU", "utf-8")
+ slist = codecs.open(slist_fn, "r", "utf-8")
for line in slist:
icao = line.split("#")[0].strip()
if icao:
sys.stdout.write(message)
sys.stdout.flush()
count = 0
- nsdcccc = codecs.open(nsdcccc_fn, "rU", "utf-8")
+ nsdcccc = codecs.open(nsdcccc_fn, "r", "utf-8")
for line in nsdcccc:
line = str(line)
fields = line.split(";")
sys.stdout.write(message)
sys.stdout.flush()
count = 0
- ourairports = open(ourairports_fn, "rU")
+ ourairports = open(ourairports_fn, "r")
for row in csv.reader(ourairports):
icao = row[12].lower()
if icao in stations:
sys.stdout.write(message)
sys.stdout.flush()
count = 0
- zlist = codecs.open(zlist_fn, "rU", "utf-8")
+ zlist = codecs.open(zlist_fn, "r", "utf-8")
for line in zlist:
line = line.split("#")[0].strip()
if line:
sys.stdout.flush()
count = 0
cpfz = {}
- cpfzcf = codecs.open(cpfzcf_fn, "rU", "utf-8")
+ cpfzcf = codecs.open(cpfzcf_fn, "r", "utf-8")
for line in cpfzcf:
fields = line.strip().split("|")
if len(fields) == 11 \
removed = 0
changed = 0
overrides = configparser.ConfigParser()
- overrides.readfp( codecs.open(overrides_fn, "r", "utf8") )
+ overrides.read_file( codecs.open(overrides_fn, "r", "utf8") )
overrideslog = []
for section in overrides.sections():
addopt = 0
sys.stdout.write(message)
sys.stdout.flush()
airports = configparser.ConfigParser()
- airports.read(airports_fn)
+ if pyversion("3"):
+ airports.read(airports_fn, encoding="utf-8")
+ else:
+ airports.read(airports_fn)
places = configparser.ConfigParser()
- places.read(places_fn)
+ if pyversion("3"):
+ places.read(places_fn, encoding="utf-8")
+ else:
+ places.read(places_fn)
stations = configparser.ConfigParser()
- stations.read(stations_fn)
+ if pyversion("3"):
+ stations.read(stations_fn, encoding="utf-8")
+ else:
+ stations.read(stations_fn)
zctas = configparser.ConfigParser()
- zctas.read(zctas_fn)
+ if pyversion("3"):
+ zctas.read(zctas_fn, encoding="utf-8")
+ else:
+ zctas.read(zctas_fn)
zones = configparser.ConfigParser()
- zones.read(zones_fn)
+ if pyversion("3"):
+ zones.read(zones_fn, encoding="utf-8")
+ else:
+ zones.read(zones_fn)
qalog = []
places_nocentroid = 0
places_nodescription = 0
projects / weather.git / blobdiff