opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18512 from gouqi11/automated-cherry-pick-of-#18511-upstream-release-3.11

Browse Source 
Automated cherry pick of #18511: fix(scheduledtask): supportCycleType week and month
This commit is contained in:
Zexi Li
2023-10-31 19:27:33 +08:00
committed by GitHub
parent d33e1f6371 8fddf20c68
commit c5923cc4b9
2 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduledtask/models/scheduled_tasks.go
+1 -1
View File
@@ -141,7 +141,7 @@ func (st *SScheduledTask) getMoreDetails(ctx context.Context, userCred mcclient.
case api.ST_TYPE_CYCLE:
out.CycleTimer = st.STimer.CycleTimerDetails()
}
out.TimerDesc = st.Description(ctx, zone)
out.TimerDesc = st.Description(ctx, st.CreatedAt, zone)
// fill label
stLabels, err := st.STLabels()
if err != nil {
pkg/scheduledtask/models/timer.go
+51 -13
View File
@@ -109,6 +109,16 @@ func (st *STimer) Update(now time.Time) {
newNextTime = newNextTime.Add(time.Duration(st.CycleNum) * time.Hour)
}
case api.TIMER_TYPE_DAY:
newNextTime = time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute(), 0, 0, time.UTC).In(now.Location())
if now.After(newNextTime) {
newNextTime = newNextTime.AddDate(0, 0, st.CycleNum)
}
case api.TIMER_TYPE_WEEK:
newNextTime = time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute(), 0, 0, time.UTC).In(now.Location())
if now.After(newNextTime) {
newNextTime = newNextTime.AddDate(0, 0, st.CycleNum*7)
}
case api.TIMER_TYPE_MONTH:
newNextTime = time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute(), 0, 0, time.UTC).In(now.Location())
if now.After(newNextTime) {
newNextTime = newNextTime.AddDate(0, st.CycleNum, 0)
@@ -188,13 +198,13 @@ func init() {
timerDescTable.Set("timerLang", i18n.NewTableEntry().EN("en").CN("cn"))
}
func (st *STimer) Description(ctx context.Context, zone *time.Location) string {
func (st *STimer) Description(ctx context.Context, createdAt time.Time, zone *time.Location) string {
lang := timerDescTable.Lookup(ctx, TIMERLANG)
switch lang {
case "en":
return st.descEnglish(zone)
return st.descEnglish(createdAt, zone)
case "cn":
return st.descChinese(zone)
return st.descChinese(createdAt, zone)
}
return ""
}
@@ -204,14 +214,19 @@ var (
wdsEN = []string{"", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"}
)
func (st *STimer) descChinese(zone *time.Location) string {
func (st *STimer) descChinese(createdAt time.Time, zone *time.Location) string {
format := "2006-01-02 15:04:05"
var prefix string
switch st.Type {
case api.TIMER_TYPE_ONCE:
return fmt.Sprintf("单次 %s触发", st.StartTime.In(zone).Format(format))
case api.TIMER_TYPE_HOUR:
prefix = fmt.Sprintf("每%d小时", st.CycleNum)
case api.TIMER_TYPE_DAY:
prefix = "每天"
if st.CycleNum > 0 {
prefix = fmt.Sprintf("每%d天", st.CycleNum)
}
case api.TIMER_TYPE_WEEK:
wds := st.GetWeekDays()
weekDays := make([]string, len(wds))
@@ -219,6 +234,9 @@ func (st *STimer) descChinese(zone *time.Location) string {
weekDays[i] = fmt.Sprintf("星期%s", wdsCN[wds[i]])
}
prefix = fmt.Sprintf("每周 【%s】", strings.Join(weekDays, "｜"))
if st.CycleNum > 0 {
prefix = fmt.Sprintf("每%d周", st.CycleNum)
}
case api.TIMER_TYPE_MONTH:
mns := st.GetMonthDays()
monthDays := make([]string, len(mns))
@@ -226,6 +244,12 @@ func (st *STimer) descChinese(zone *time.Location) string {
monthDays[i] = fmt.Sprintf("%d号", mns[i])
}
prefix = fmt.Sprintf("每月 【%s】", strings.Join(monthDays, "｜"))
if st.CycleNum > 0 {
prefix = fmt.Sprintf("每%d月", st.CycleNum)
}
}
if st.CycleNum > 0 {
return fmt.Sprintf("%s同步一次，开始时间： 有效时间为%s至%s", prefix, createdAt.In(zone).Format(format), st.EndTime.In(zone).Format(format))
}
return fmt.Sprintf("%s %s触发 有效时间为%s至%s", prefix, st.hourMinutesDesc(zone), st.StartTime.In(zone).Format(format), st.EndTime.In(zone).Format(format))
}
@@ -236,18 +260,35 @@ func (st *STimer) hourMinutesDesc(zone *time.Location) string {
return fmt.Sprintf("%02d:%02d", t.Hour(), t.Minute())
}
func (st *STimer) descEnglish(zone *time.Location) string {
func (st *STimer) descEnglish(createdAt time.Time, zone *time.Location) string {
var detail string
format := "2006-01-02 15:04:05"
switch st.Type {
case api.TIMER_TYPE_ONCE:
return st.EndTime.In(zone).Format(format)
case api.TIMER_TYPE_HOUR:
detail = fmt.Sprintf("every %d hours", st.CycleNum)
case api.TIMER_TYPE_DAY:
detail = fmt.Sprintf("%s every day", st.hourMinutesDesc(zone))
if st.CycleNum > 0 {
detail = fmt.Sprintf("every %d days", st.CycleNum)
} else {
detail = fmt.Sprintf("%s every day", st.hourMinutesDesc(zone))
}
case api.TIMER_TYPE_WEEK:
detail = st.weekDaysDesc(zone)
if st.CycleNum > 0 {
detail = fmt.Sprintf("every %d weeks", st.CycleNum)
} else {
detail = st.weekDaysDesc(zone)
}
case api.TIMER_TYPE_MONTH:
detail = st.monthDaysDesc(zone)
if st.CycleNum > 0 {
detail = fmt.Sprintf("every %d months", st.CycleNum)
} else {
detail = st.monthDaysDesc(zone)
}
}
if st.CycleNum > 0 {
return fmt.Sprintf("Execute %s, start at:%s , from %s to %s", detail, createdAt.In(zone).Format(format), st.StartTime.In(zone).Format(format), st.EndTime.In(zone).Format(format))
}
if st.EndTime.IsZero() {
return detail
@@ -327,18 +368,15 @@ func checkCycleTimerCreateInput(in api.CycleTimerCreateInput) (api.CycleTimerCre
in.WeekDays = []int{}
in.MonthDays = []int{}
case api.TIMER_TYPE_DAY:
if in.CycleNum <= 0 {
return in, fmt.Errorf("day cycle_num must upper than 0")
}
in.WeekDays = []int{}
in.MonthDays = []int{}
case api.TIMER_TYPE_WEEK:
if len(in.WeekDays) == 0 {
if len(in.WeekDays) == 0 && in.CycleNum == 0 {
return in, fmt.Errorf("week_days should not be empty")
}
in.MonthDays = []int{}
case api.TIMER_TYPE_MONTH:
if len(in.MonthDays) == 0 {
if len(in.MonthDays) == 0 && in.CycleNum == 0 {
return in, fmt.Errorf("month_days should not be empty")
}
in.WeekDays = []int{}