Fix handling of run_at_sunset/sunrise with offset

[ekutner]

This PR fixes issue #2188

[acockburn]

Hi there - quick update in this - we do thank you for the fixes, but we have done some other work in this area that may conflict, or may already fix the issue, we are double checking.

[ekutner]

Looking at the dev branch code I don't believe it's fixed. The problem is simple, the current code starts by always taking the next sunset/sunrise and building on top of that, however, when an offset is specified and the code is running after today's sunset but before the sunset+offset time, then looking at the next sunset is wrong. In that case you need to take today's sunset and then add the offset to it. So the fix is still required and merging it would be greatly appreciated because it's a problem I encounter all the time, having a lot of sunset+offset schedules.

[acockburn]

After a review we agree - I'll merge this to the next release.

[ekutner]

Thank you

[jsl12]

@ekutner my apologies on this one - I was the holdup. This has been on my list to look into for a while, but other things kept coming up and I thought there was a chance this wasn't an issue any more.

We appreciate your patience

[ekutner]

And I appreciate you're great work on this project. It allowed me to do things with Home Assistant that are unthinkable with the built in scripting engine. Thank you all again!