# HG changeset patch # User Paul Fisher # Date 1573432924 18000 # Node ID 88249e45156664cf7932d1dd02b7af32307a1ec7 # Parent e229afdd447b071b35fffe14debd1c0ddfdf846d server: show date when last report was >12h ago. diff -r e229afdd447b -r 88249e451566 setup.py --- a/setup.py Fri Nov 01 00:48:56 2019 -0400 +++ b/setup.py Sun Nov 10 19:42:04 2019 -0500 @@ -2,7 +2,7 @@ setuptools.setup( name='weather-server', - version='0.0.7', + version='0.0.8', packages=setuptools.find_packages(), python_requires='>=3.7', install_requires=[ diff -r e229afdd447b -r 88249e451566 weather_server/server.py --- a/weather_server/server.py Fri Nov 01 00:48:56 2019 -0400 +++ b/weather_server/server.py Sun Nov 10 19:42:04 2019 -0500 @@ -55,11 +55,15 @@ date = tz.normalize(last_reading.sample_time.astimezone(tz)) else: date = None + now = datetime.datetime.now(tz=pytz.UTC) + diff = (now - date) if date else None + is_recent = diff and diff < datetime.timedelta(hours=12) return flask.render_template( 'location.html', location=loc, last_reading=last_reading, - date=date) + date=date, + date_format=f'%H:%M' if is_recent else '%Y-%m-%d %H:%M') @app.route('//recent') def recent(location: str): diff -r e229afdd447b -r 88249e451566 weather_server/templates/location.html --- a/weather_server/templates/location.html Fri Nov 01 00:48:56 2019 -0400 +++ b/weather_server/templates/location.html Sun Nov 10 19:42:04 2019 -0500 @@ -36,7 +36,9 @@

Reported - {{ "{:%H:%M}".format(date) }} + + {{- "{date:{fmt}}".format(date=date, fmt=date_format) -}} +

{% else %}