joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redo the scheduling so it works close to the dateline, too

Browse Source
This commit is contained in:
Jakob Ketterl 2020-01-24 23:29:25 +01:00
parent 05af69f7b2
commit b63a991008
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
owrx/service/schedule.py
View File

@ -168,24 +168,36 @@ class DaylightSchedule(TimerangeSchedule):
return sunrise, sunset return sunrise, sunset
def getEntries(self): def getEntries(self):
date = datetime.utcnow().date() now = datetime.utcnow()
date = now.date()
# greyline is optional, it its set it will shorten the other profiles # greyline is optional, it its set it will shorten the other profiles
useGreyline = "greyline" in self.schedule useGreyline = "greyline" in self.schedule
entries = [] entries = []
sunrise, sunset = self.getSunTimes(date)
delta = DaylightSchedule.greyLineTime if useGreyline else timedelta() delta = DaylightSchedule.greyLineTime if useGreyline else timedelta()
events = []
# we need to start yesterday for longitudes close to the date line
offset = -1
while len(events) < 1:
sunrise, sunset = self.getSunTimes(date + timedelta(days=offset))
offset += 1
events += [{"type": "sunrise", "time": sunrise}, {"type": "sunset", "time": sunset}]
# keep only events in the future
events = [v for v in events if v["time"] + delta > now]
events.sort(key=lambda e: e["time"])
entries += [ previousEvent = None
DatetimeScheduleEntry(datetime.combine(date, datetime.min.time()), sunrise - delta, self.schedule["night"]), for event in events:
DatetimeScheduleEntry(sunrise + delta, sunset - delta, self.schedule["day"]), # night profile _until_ sunrise, day profile _until_ sunset
DatetimeScheduleEntry(sunset + delta, datetime.combine(date, datetime.max.time()), self.schedule["night"]), stype = "night" if event["type"] == "sunrise" else "day"
] if previousEvent is not None or event["time"] - delta > now:
start = now if previousEvent is None else previousEvent
entries.append(DatetimeScheduleEntry(start, event["time"] - delta, self.schedule[stype]))
if useGreyline: if useGreyline:
entries += [ entries.append(
DatetimeScheduleEntry(sunrise - delta, sunrise + delta, self.schedule["greyline"]), DatetimeScheduleEntry(event["time"] - delta, event["time"] + delta, self.schedule["greyline"])
DatetimeScheduleEntry(sunset - delta, sunset + delta, self.schedule["greyline"]), )
] previousEvent = event["time"] + delta
logger.debug([str(e) for e in entries]) logger.debug([str(e) for e in entries])
return entries return entries