diff options
| -rw-r--r-- | cached/weather_data.py | 3 | ||||
| -rw-r--r-- | cached/weather_forecast.py | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/cached/weather_data.py b/cached/weather_data.py index 4c46448..78f7ade 100644 --- a/cached/weather_data.py +++ b/cached/weather_data.py @@ -3,6 +3,7 @@ from dataclasses import dataclass import datetime import json +import os from typing import List import urllib.request @@ -19,7 +20,7 @@ cfg = config.add_commandline_args( cfg.add_argument( '--weather_data_cachefile', type=str, - default='/home/scott/.weather_summary_cache', + default=f'{os.environ["HOME"]}/.weather_summary_cache', metavar='FILENAME', help='File in which to cache weather data' ) diff --git a/cached/weather_forecast.py b/cached/weather_forecast.py index ce4725d..4be53c8 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,9 @@ class CachedDetailedWeatherForecast(object): sunrise = s['sunrise'] sunset = s['sunset'] - if dt.date == now.date: + if dt.date == now.date and not said_temp: blurb = f'{day.get_text()}: The current outside tempterature is {current_temp}. ' + txt.get_text() + said_temp = True else: blurb = f'{day.get_text()}: {txt.get_text()}' blurb = text_utils.wrap_string(blurb, 80) |