Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

save character_settings response error #556

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

save character_settings response error #556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 41 additions & 39 deletions internal/server/http_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,52 +717,54 @@ func (s *HttpServer) characterSettings(w http.ResponseWriter, r *http.Request) {
// Scheduler config
cfg.Scheduler.Enabled = r.Form.Has("schedulerEnabled")

for day := 0; day < 7; day++ {

starts := r.Form[fmt.Sprintf("scheduler[%d][start][]", day)]
ends := r.Form[fmt.Sprintf("scheduler[%d][end][]", day)]

cfg.Scheduler.Days[day].DayOfWeek = day
cfg.Scheduler.Days[day].TimeRanges = make([]config.TimeRange, 0)

for i := 0; i < len(starts); i++ {
start, err := time.Parse("15:04", starts[i])
if err != nil {
s.templates.ExecuteTemplate(w, "character_settings.gohtml", CharacterSettings{
ErrorMessage: fmt.Sprintf("Invalid start time format for day %d: %s", day, starts[i]),
// ... (other fields)
})
return
}

end, err := time.Parse("15:04", ends[i])
if err != nil {
s.templates.ExecuteTemplate(w, "character_settings.gohtml", CharacterSettings{
ErrorMessage: fmt.Sprintf("Invalid end time format for day %d: %s", day, ends[i]),
if cfg.Scheduler.Enabled {
for day := 0; day < 7; day++ {

starts := r.Form[fmt.Sprintf("scheduler[%d][start][]", day)]
ends := r.Form[fmt.Sprintf("scheduler[%d][end][]", day)]

cfg.Scheduler.Days[day].DayOfWeek = day
cfg.Scheduler.Days[day].TimeRanges = make([]config.TimeRange, 0)

for i := 0; i < len(starts); i++ {
start, err := time.Parse("15:04", starts[i])
if err != nil {
s.templates.ExecuteTemplate(w, "character_settings.gohtml", CharacterSettings{
ErrorMessage: fmt.Sprintf("Invalid start time format for day %d: %s", day, starts[i]),
// ... (other fields)
})
return
}

end, err := time.Parse("15:04", ends[i])
if err != nil {
s.templates.ExecuteTemplate(w, "character_settings.gohtml", CharacterSettings{
ErrorMessage: fmt.Sprintf("Invalid end time format for day %d: %s", day, ends[i]),
})
return
}

cfg.Scheduler.Days[day].TimeRanges = append(cfg.Scheduler.Days[day].TimeRanges, struct {
Start time.Time "yaml:\"start\""
End time.Time "yaml:\"end\""
}{
Start: start,
End: end,
})
return
}
}

cfg.Scheduler.Days[day].TimeRanges = append(cfg.Scheduler.Days[day].TimeRanges, struct {
Start time.Time "yaml:\"start\""
End time.Time "yaml:\"end\""
}{
Start: start,
End: end,
// Validate scheduler data
err := validateSchedulerData(cfg)
if err != nil {
s.templates.ExecuteTemplate(w, "character_settings.gohtml", CharacterSettings{
ErrorMessage: err.Error(),
// ... (other fields)
})
return
}
}

// Validate scheduler data
err := validateSchedulerData(cfg)
if err != nil {
s.templates.ExecuteTemplate(w, "character_settings.gohtml", CharacterSettings{
ErrorMessage: err.Error(),
// ... (other fields)
})
return
}

// Health config
cfg.Health.HealingPotionAt, _ = strconv.Atoi(r.Form.Get("healingPotionAt"))
cfg.Health.ManaPotionAt, _ = strconv.Atoi(r.Form.Get("manaPotionAt"))
Expand Down