mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-24 22:15:45 +03:00
d3ada9881a
Merge in DNS/adguard-home from 951-blocked-services-schedule to master Squashed commit of the following: commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8 Merge: 2705fbcfb7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 14 15:00:56 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 14 14:56:01 2023 +0300 schedule: imp field alignment commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d Merge: f99936f369fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jun 13 11:49:15 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule commit f99936f36be3453b50d772ce10bfdc1ad14879c5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jun 9 19:14:06 2023 +0300 schedule: add tests commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 20:10:03 2023 +0300 schedule: imp code commit 850a3d93e659e0584bd449cf5af3f13b36be9e62 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 18:57:23 2023 +0300 schedule: imp tests commit d54c42b782a4a806d2f35abbea1826ba6394a64c Merge: 21dfa51ea156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 18:12:03 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jun 8 18:02:47 2023 +0300 all: add todo commit d0d4532c8911fb6365f6af66ceb72a70b158b77d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 7 18:54:44 2023 +0300 all: upd chlog commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 7 17:34:28 2023 +0300 all: add tests commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jun 7 13:20:00 2023 +0300 all: add schedule pkg commit e0bcad0193a559a89f5f5052f5a985fa730d23be Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jun 2 13:03:04 2023 +0300 filtering: add test case commit da7a7c20c84151ff83414cb5d576a91740a1be7e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed May 31 15:31:48 2023 +0300 filtering: imp code commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 17:46:24 2023 +0300 filtering: add type check commit f4bcea8ad90d584ceff236ccce4f246e391e0e33 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 17:37:25 2023 +0300 all: imp code commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 15:20:33 2023 +0300 filtering: imp err msg commit 1befab59cf2a12a3bc8296066ce1115dff5a8843 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 29 14:31:14 2023 +0300 filtering: imp tests commit 09506f924f363f1563009cec0c44ad40d08b8ddd Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri May 26 18:44:12 2023 +0300 filtering: add tests commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri May 26 17:57:01 2023 +0300 all: fix typos commit 69399cd3ea17691ff0848baf43ff09b18b82114c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu May 25 18:50:51 2023 +0300 all: upd chlog ... and 2 more commits
220 lines
6.1 KiB
Go
220 lines
6.1 KiB
Go
// Package schedule provides types for scheduling.
|
|
package schedule
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/AdguardTeam/golibs/timeutil"
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
// Weekly is a schedule for one week. Each day of the week has one range with
|
|
// a beginning and an end.
|
|
type Weekly struct {
|
|
// location is used to calculate the offsets of the day ranges.
|
|
location *time.Location
|
|
|
|
// days are the day ranges of this schedule. The indexes of this array are
|
|
// the [time.Weekday] values.
|
|
days [7]dayRange
|
|
}
|
|
|
|
// EmptyWeekly creates empty weekly schedule with local time zone.
|
|
func EmptyWeekly() (w *Weekly) {
|
|
return &Weekly{
|
|
location: time.Local,
|
|
}
|
|
}
|
|
|
|
// Contains returns true if t is within the corresponding day range of the
|
|
// schedule in the schedule's time zone.
|
|
func (w *Weekly) Contains(t time.Time) (ok bool) {
|
|
t = t.In(w.location)
|
|
wd := t.Weekday()
|
|
dr := w.days[wd]
|
|
|
|
// Calculate the offset of the day range.
|
|
//
|
|
// NOTE: Do not use [time.Truncate] since it requires UTC time zone.
|
|
y, m, d := t.Date()
|
|
day := time.Date(y, m, d, 0, 0, 0, 0, w.location)
|
|
offset := t.Sub(day)
|
|
|
|
return dr.contains(offset)
|
|
}
|
|
|
|
// type check
|
|
var _ yaml.Unmarshaler = (*Weekly)(nil)
|
|
|
|
// UnmarshalYAML implements the [yaml.Unmarshaler] interface for *Weekly.
|
|
func (w *Weekly) UnmarshalYAML(value *yaml.Node) (err error) {
|
|
conf := &weeklyConfig{}
|
|
|
|
err = value.Decode(conf)
|
|
if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
weekly := Weekly{}
|
|
|
|
weekly.location, err = time.LoadLocation(conf.TimeZone)
|
|
if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
days := []dayConfig{
|
|
time.Sunday: conf.Sunday,
|
|
time.Monday: conf.Monday,
|
|
time.Tuesday: conf.Tuesday,
|
|
time.Wednesday: conf.Wednesday,
|
|
time.Thursday: conf.Thursday,
|
|
time.Friday: conf.Friday,
|
|
time.Saturday: conf.Saturday,
|
|
}
|
|
for i, d := range days {
|
|
r := dayRange{
|
|
start: d.Start.Duration,
|
|
end: d.End.Duration,
|
|
}
|
|
|
|
err = w.validate(r)
|
|
if err != nil {
|
|
return fmt.Errorf("weekday %s: %w", time.Weekday(i), err)
|
|
}
|
|
|
|
weekly.days[i] = r
|
|
}
|
|
|
|
*w = weekly
|
|
|
|
return nil
|
|
}
|
|
|
|
// weeklyConfig is the YAML configuration structure of Weekly.
|
|
type weeklyConfig struct {
|
|
// TimeZone is the local time zone.
|
|
TimeZone string `yaml:"time_zone"`
|
|
|
|
// Days of the week.
|
|
|
|
Sunday dayConfig `yaml:"sun,omitempty"`
|
|
Monday dayConfig `yaml:"mon,omitempty"`
|
|
Tuesday dayConfig `yaml:"tue,omitempty"`
|
|
Wednesday dayConfig `yaml:"wed,omitempty"`
|
|
Thursday dayConfig `yaml:"thu,omitempty"`
|
|
Friday dayConfig `yaml:"fri,omitempty"`
|
|
Saturday dayConfig `yaml:"sat,omitempty"`
|
|
}
|
|
|
|
// dayConfig is the YAML configuration structure of dayRange.
|
|
type dayConfig struct {
|
|
Start timeutil.Duration `yaml:"start"`
|
|
End timeutil.Duration `yaml:"end"`
|
|
}
|
|
|
|
// maxDayRange is the maximum value for day range end.
|
|
const maxDayRange = 24 * time.Hour
|
|
|
|
// validate returns the day range rounding errors, if any.
|
|
func (w *Weekly) validate(r dayRange) (err error) {
|
|
defer func() { err = errors.Annotate(err, "bad day range: %w") }()
|
|
|
|
err = r.validate()
|
|
if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
start := r.start.Truncate(time.Minute)
|
|
end := r.end.Truncate(time.Minute)
|
|
|
|
switch {
|
|
case start != r.start:
|
|
return fmt.Errorf("start %s isn't rounded to minutes", r.start)
|
|
case end != r.end:
|
|
return fmt.Errorf("end %s isn't rounded to minutes", r.end)
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// type check
|
|
var _ yaml.Marshaler = (*Weekly)(nil)
|
|
|
|
// MarshalYAML implements the [yaml.Marshaler] interface for *Weekly.
|
|
func (w *Weekly) MarshalYAML() (v any, err error) {
|
|
return weeklyConfig{
|
|
TimeZone: w.location.String(),
|
|
Sunday: dayConfig{
|
|
Start: timeutil.Duration{Duration: w.days[time.Sunday].start},
|
|
End: timeutil.Duration{Duration: w.days[time.Sunday].end},
|
|
},
|
|
Monday: dayConfig{
|
|
Start: timeutil.Duration{Duration: w.days[time.Monday].start},
|
|
End: timeutil.Duration{Duration: w.days[time.Monday].end},
|
|
},
|
|
Tuesday: dayConfig{
|
|
Start: timeutil.Duration{Duration: w.days[time.Tuesday].start},
|
|
End: timeutil.Duration{Duration: w.days[time.Tuesday].end},
|
|
},
|
|
Wednesday: dayConfig{
|
|
Start: timeutil.Duration{Duration: w.days[time.Wednesday].start},
|
|
End: timeutil.Duration{Duration: w.days[time.Wednesday].end},
|
|
},
|
|
Thursday: dayConfig{
|
|
Start: timeutil.Duration{Duration: w.days[time.Thursday].start},
|
|
End: timeutil.Duration{Duration: w.days[time.Thursday].end},
|
|
},
|
|
Friday: dayConfig{
|
|
Start: timeutil.Duration{Duration: w.days[time.Friday].start},
|
|
End: timeutil.Duration{Duration: w.days[time.Friday].end},
|
|
},
|
|
Saturday: dayConfig{
|
|
Start: timeutil.Duration{Duration: w.days[time.Saturday].start},
|
|
End: timeutil.Duration{Duration: w.days[time.Saturday].end},
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
// dayRange represents a single interval within a day. The interval begins at
|
|
// start and ends before end. That is, it contains a time point T if start <=
|
|
// T < end.
|
|
type dayRange struct {
|
|
// start is an offset from the beginning of the day. It must be greater
|
|
// than or equal to zero and less than 24h.
|
|
start time.Duration
|
|
|
|
// end is an offset from the beginning of the day. It must be greater than
|
|
// or equal to zero and less than or equal to 24h.
|
|
end time.Duration
|
|
}
|
|
|
|
// validate returns the day range validation errors, if any.
|
|
func (r dayRange) validate() (err error) {
|
|
switch {
|
|
case r == dayRange{}:
|
|
return nil
|
|
case r.start < 0:
|
|
return fmt.Errorf("start %s is negative", r.start)
|
|
case r.end < 0:
|
|
return fmt.Errorf("end %s is negative", r.end)
|
|
case r.start >= r.end:
|
|
return fmt.Errorf("start %s is greater or equal to end %s", r.start, r.end)
|
|
case r.start >= maxDayRange:
|
|
return fmt.Errorf("start %s is greater or equal to %s", r.start, maxDayRange)
|
|
case r.end > maxDayRange:
|
|
return fmt.Errorf("end %s is greater than %s", r.end, maxDayRange)
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// contains returns true if start <= offset < end, where offset is the time
|
|
// duration from the beginning of the day.
|
|
func (r *dayRange) contains(offset time.Duration) (ok bool) {
|
|
return r.start <= offset && offset < r.end
|
|
}
|