X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=cached%2Fweather_forecast.py;h=6e2f5f9ca0ffcc9eae3d2c7d6615549fb222a0db;hb=d82c8377ce394cad812dc0d53829f7465b3f3f4e;hp=ce4725d64a6c43699ab702b85d60d1f070366cf5;hpb=d2730e42f1160d45ab6c7780987b16ae83c616f6;p=python_utils.git diff --git a/cached/weather_forecast.py b/cached/weather_forecast.py index ce4725d..6e2f5f9 100644 --- a/cached/weather_forecast.py +++ b/cached/weather_forecast.py @@ -3,6 +3,7 @@ from dataclasses import dataclass import datetime import logging +import os import urllib.request import astral # type: ignore @@ -26,7 +27,7 @@ cfg = config.add_commandline_args( cfg.add_argument( '--weather_forecast_cachefile', type=str, - default='/home/scott/.weather_forecast_cache', + default=f'{os.environ["HOME"]}/.weather_forecast_cache', metavar='FILENAME', help='File in which to cache weather data' ) @@ -79,6 +80,7 @@ class CachedDetailedWeatherForecast(object): forecast = soup.find(id='detailed-forecast-body') parser = dp.DateParser() + said_temp = False last_dt = now dt = now for (day, txt) in zip( @@ -100,8 +102,10 @@ class CachedDetailedWeatherForecast(object): sunrise = s['sunrise'] sunset = s['sunset'] - if dt.date == now.date: - blurb = f'{day.get_text()}: The current outside tempterature is {current_temp}. ' + txt.get_text() + if dt.date() == now.date() and not said_temp: + blurb = f'{day.get_text()}: The current outside tempterature is {current_temp}. ' + blurb += txt.get_text() + said_temp = True else: blurb = f'{day.get_text()}: {txt.get_text()}' blurb = text_utils.wrap_string(blurb, 80)