projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cached weather data.
[python_utils.git]
/
cached
/
weather_forecast.py
diff --git
a/cached/weather_forecast.py
b/cached/weather_forecast.py
index ce4725d64a6c43699ab702b85d60d1f070366cf5..4be53c8367c5d26fbbf1d29abe987ae0ae4ad85d 100644
(file)
--- a/
cached/weather_forecast.py
+++ b/
cached/weather_forecast.py
@@
-3,6
+3,7
@@
from dataclasses import dataclass
import datetime
import logging
from dataclasses import dataclass
import datetime
import logging
+import os
import urllib.request
import astral # type: ignore
import urllib.request
import astral # type: ignore
@@
-26,7
+27,7
@@
cfg = config.add_commandline_args(
cfg.add_argument(
'--weather_forecast_cachefile',
type=str,
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'
)
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()
forecast = soup.find(id='detailed-forecast-body')
parser = dp.DateParser()
+ said_temp = False
last_dt = now
dt = now
for (day, txt) in zip(
last_dt = now
dt = now
for (day, txt) in zip(
@@
-100,8
+102,9
@@
class CachedDetailedWeatherForecast(object):
sunrise = s['sunrise']
sunset = s['sunset']
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()
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)
else:
blurb = f'{day.get_text()}: {txt.get_text()}'
blurb = text_utils.wrap_string(blurb, 80)