feat: create model for pomodoro settings

- introduce GoTomatoTimerConfig
- create instance variable with current config
- update code to use the new variable
This commit is contained in:
Sebastian Mark 2024-10-20 14:42:50 +02:00
parent 09b475dd61
commit 85923b4469
3 changed files with 20 additions and 13 deletions

View file

@ -7,12 +7,12 @@ import (
"sync" "sync"
) )
const ( var PomodoroConfig = models.GoTomatoTimerConfig{
workDuration = 15 * 60 Work: 15 * 60,
shortBreakDuration = 5 * 60 ShortBreak: 5 * 60,
longBreakDuration = 10 * 60 LongBreak: 10 * 60,
sessions = 4 Sessions: 4,
) }
var pomodoroRunning bool var pomodoroRunning bool
var pomodoroPaused bool var pomodoroPaused bool
@ -30,16 +30,16 @@ func RunPomodoroTimer(clients map[*websocket.Conn]*models.Client) {
pomodoroPaused = false pomodoroPaused = false
mu.Unlock() mu.Unlock()
for session := 1; session <= sessions; session++ { for session := 1; session <= PomodoroConfig.Sessions; session++ {
if !startTimer(clients, workDuration, "Work", session) { if !startTimer(clients, PomodoroConfig.Work, "Work", session) {
break break
} }
if session == sessions { if session == PomodoroConfig.Sessions {
if !startTimer(clients, longBreakDuration, "LongBreak", session) { if !startTimer(clients, PomodoroConfig.LongBreak, "LongBreak", session) {
break break
} }
} else { } else {
if !startTimer(clients, shortBreakDuration, "ShortBreak", session) { if !startTimer(clients, PomodoroConfig.ShortBreak, "ShortBreak", session) {
break break
} }
} }

View file

@ -23,7 +23,7 @@ func startTimer(clients map[*websocket.Conn]*models.Client, remainingSeconds int
broadcast.BroadcastMessage(clients, models.BroadcastMessage{ broadcast.BroadcastMessage(clients, models.BroadcastMessage{
Mode: mode, Mode: mode,
Session: session, Session: session,
MaxSession: sessions, MaxSession: PomodoroConfig.Sessions,
TimeLeft: remainingSeconds, TimeLeft: remainingSeconds,
}) })
time.Sleep(time.Second) time.Sleep(time.Second)
@ -36,7 +36,7 @@ func startTimer(clients map[*websocket.Conn]*models.Client, remainingSeconds int
broadcast.BroadcastMessage(clients, models.BroadcastMessage{ broadcast.BroadcastMessage(clients, models.BroadcastMessage{
Mode: mode, Mode: mode,
Session: session, Session: session,
MaxSession: sessions, MaxSession: PomodoroConfig.Sessions,
TimeLeft: 0, TimeLeft: 0,
}) })

View file

@ -1,5 +1,12 @@
package models package models
type GoTomatoTimerConfig struct {
Work int `json:"work"`
ShortBreak int `json:"shortBreak"`
LongBreak int `json:"longBreak"`
Sessions int `json:"sessions"`
}
type GoTomatoServerConfig struct { type GoTomatoServerConfig struct {
ListenAddress string `json:"listenAddress"` ListenAddress string `json:"listenAddress"`
ListenPort int `json:"listenPort"` ListenPort int `json:"listenPort"`