edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Show past 12 months of market days on calendar

Browse source
This commit is contained in:
Edward Betts 2023-11-05 12:44:48 +00:00
parent e8bda4f969
commit aeeeea2041
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agenda/__init__.py
View file

@ -420,9 +420,9 @@ def get_data(now: datetime) -> typing.Mapping[str, str | object]:
"gwr_advance_tickets": gwr.advance_ticket_date(data_dir), "gwr_advance_tickets": gwr.advance_ticket_date(data_dir),
"critical_mass": critical_mass(today), "critical_mass": critical_mass(today),
"market": ( "market": (
markets.windmill_hill(today) markets.windmill_hill(last_year)
+ markets.tobacco_factory(today) + markets.tobacco_factory(last_year)
+ markets.nailsea_farmers(today) + markets.nailsea_farmers(last_year)
), ),
"rockets": thespacedevs.get_launches(rocket_dir, limit=40), "rockets": thespacedevs.get_launches(rocket_dir, limit=40),
} }

29
agenda/markets.py
View file

@ -7,9 +7,11 @@ from dateutil.relativedelta import SA, relativedelta
from .types import Event from .types import Event
uk_tz = pytz.timezone("Europe/London")
def windmill_hill(start_date: date) -> list[Event]:
"""Windmill Hill Market days for the next 12 months from a given date.""" def windmill_hill(start_date: date, months: int = 24) -> list[Event]:
"""Windmill Hill Market days for the next 24 months from a given date."""
events: list[Event] = [] events: list[Event] = []
current_date = start_date current_date = start_date
url = ( url = (
@ -20,11 +22,10 @@ def windmill_hill(start_date: date) -> list[Event]:
# To keep count of how many market days have been calculated # To keep count of how many market days have been calculated
count = 0 count = 0
tz = pytz.timezone("Europe/London")
start = time(10, 0) start = time(10, 0)
end = time(15, 0) end = time(15, 0)
while count < 12: while count < months:
# Skip months outside of April to December # Skip months outside of April to December
if current_date.month < 4 or current_date.month > 12: if current_date.month < 4 or current_date.month > 12:
current_date += relativedelta(months=1) current_date += relativedelta(months=1)
@ -40,8 +41,8 @@ def windmill_hill(start_date: date) -> list[Event]:
Event( Event(
name="market", name="market",
title="Windmill Hill Market", title="Windmill Hill Market",
date=tz.localize(datetime.combine(first_saturday, start)), date=uk_tz.localize(datetime.combine(first_saturday, start)),
end_date=tz.localize(datetime.combine(first_saturday, end)), end_date=uk_tz.localize(datetime.combine(first_saturday, end)),
url=url, url=url,
) )
) )
@ -54,7 +55,7 @@ def windmill_hill(start_date: date) -> list[Event]:
return events return events
def tobacco_factory(start_date: date) -> list[Event]: def tobacco_factory(start_date: date, weeks: int = 52 * 2) -> list[Event]:
"""Tobacco Factory Market days for the next 12 months from a given date.""" """Tobacco Factory Market days for the next 12 months from a given date."""
events: list[Event] = [] events: list[Event] = []
current_date = start_date current_date = start_date
@ -62,11 +63,10 @@ def tobacco_factory(start_date: date) -> list[Event]:
url = "https://tobaccofactory.com/whats-on/sunday-market/" url = "https://tobaccofactory.com/whats-on/sunday-market/"
tz = pytz.timezone("Europe/London")
start = time(10, 0) start = time(10, 0)
end = time(14, 30) end = time(14, 30)
while count < 52: # 52 weeks in a year while count < weeks: # 52 weeks in a year
# Calculate the next Sunday from the current date # Calculate the next Sunday from the current date
next_sunday = current_date + relativedelta(weekday=6) # Sunday is 6 next_sunday = current_date + relativedelta(weekday=6) # Sunday is 6
@ -76,8 +76,8 @@ def tobacco_factory(start_date: date) -> list[Event]:
Event( Event(
name="market", name="market",
title="Tobacco Factory Sunday Market", title="Tobacco Factory Sunday Market",
date=tz.localize(datetime.combine(next_sunday, start)), date=uk_tz.localize(datetime.combine(next_sunday, start)),
end_date=tz.localize(datetime.combine(next_sunday, end)), end_date=uk_tz.localize(datetime.combine(next_sunday, end)),
url=url, url=url,
) )
) )
@ -89,16 +89,15 @@ def tobacco_factory(start_date: date) -> list[Event]:
return events return events
def nailsea_farmers(start_date: date) -> list[Event]: def nailsea_farmers(start_date: date, months: int = 52 * 2) -> list[Event]:
"""Nailsea Farmers Market days for the next 12 months from a given date.""" """Nailsea Farmers Market days for the next 12 months from a given date."""
events: list[Event] = [] events: list[Event] = []
current_date = start_date current_date = start_date
count = 0 count = 0
tz = pytz.timezone("Europe/London")
t = time(9, 0) # The market starts at 9am t = time(9, 0) # The market starts at 9am
while count < 12: while count < months:
# Calculate the 3rd Saturday of the current month # Calculate the 3rd Saturday of the current month
third_saturday = current_date + relativedelta(day=1, weekday=SA(+3)) third_saturday = current_date + relativedelta(day=1, weekday=SA(+3))
@ -108,7 +107,7 @@ def nailsea_farmers(start_date: date) -> list[Event]:
Event( Event(
name="market", name="market",
title="Nailsea Farmers Market", title="Nailsea Farmers Market",
date=tz.localize(datetime.combine(third_saturday, t)), date=uk_tz.localize(datetime.combine(third_saturday, t)),
) )
) )
count += 1 count += 1