daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request 2321: upd-go-deps

Browse Source 
Merge in DNS/adguard-home from upd-go-deps to master

Squashed commit of the following:

commit 2c0b63da2ec8bbf19bc7dbb03c0166f6f9a5d822
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 12 14:42:31 2024 +0300

    all: upd go deps, tools
This commit is contained in:
Ainar Garipov
2024-12-12 16:20:13 +03:00
parent d3cc2dc930
commit dedbadafc4
23 changed files with 194 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
internal/schedule/schedule.go
View File

@@ -163,8 +163,8 @@ func (w *Weekly) UnmarshalYAML(value *yaml.Node) (err error) {
}
for i, d := range days {
r := dayRange{
start: d.Start.Duration,
end: d.End.Duration,
start: time.Duration(d.Start),
end: time.Duration(d.End),
}
err = w.validate(r)
@@ -255,32 +255,32 @@ func (w *Weekly) MarshalYAML() (v any, err error) {
return weeklyConfigYAML{
TimeZone: w.location.String(),
Sunday: dayConfigYAML{
Start: timeutil.Duration{Duration: w.days[time.Sunday].start},
End: timeutil.Duration{Duration: w.days[time.Sunday].end},
Start: timeutil.Duration(w.days[time.Sunday].start),
End: timeutil.Duration(w.days[time.Sunday].end),
},
Monday: dayConfigYAML{
Start: timeutil.Duration{Duration: w.days[time.Monday].start},
End: timeutil.Duration{Duration: w.days[time.Monday].end},
Start: timeutil.Duration(w.days[time.Monday].start),
End: timeutil.Duration(w.days[time.Monday].end),
},
Tuesday: dayConfigYAML{
Start: timeutil.Duration{Duration: w.days[time.Tuesday].start},
End: timeutil.Duration{Duration: w.days[time.Tuesday].end},
Start: timeutil.Duration(w.days[time.Tuesday].start),
End: timeutil.Duration(w.days[time.Tuesday].end),
},
Wednesday: dayConfigYAML{
Start: timeutil.Duration{Duration: w.days[time.Wednesday].start},
End: timeutil.Duration{Duration: w.days[time.Wednesday].end},
Start: timeutil.Duration(w.days[time.Wednesday].start),
End: timeutil.Duration(w.days[time.Wednesday].end),
},
Thursday: dayConfigYAML{
Start: timeutil.Duration{Duration: w.days[time.Thursday].start},
End: timeutil.Duration{Duration: w.days[time.Thursday].end},
Start: timeutil.Duration(w.days[time.Thursday].start),
End: timeutil.Duration(w.days[time.Thursday].end),
},
Friday: dayConfigYAML{
Start: timeutil.Duration{Duration: w.days[time.Friday].start},
End: timeutil.Duration{Duration: w.days[time.Friday].end},
Start: timeutil.Duration(w.days[time.Friday].start),
End: timeutil.Duration(w.days[time.Friday].end),
},
Saturday: dayConfigYAML{
Start: timeutil.Duration{Duration: w.days[time.Saturday].start},
End: timeutil.Duration{Duration: w.days[time.Saturday].end},
Start: timeutil.Duration(w.days[time.Saturday].start),
End: timeutil.Duration(w.days[time.Saturday].end),
},
}, nil
}