feat: update variable and function name for started pomodoro
- change variable name from pomodoroRunning to pomodoroOngoing
- update function name from IsPomodoroRunning to IsPomodoroOngoing
- modify client command checks to use IsPomodoroActive instead of IsPomodoroRunning
🤖
This commit is contained in:
parent
b71d04aad2
commit
b46d2469d3
2 changed files with 10 additions and 10 deletions
|
@ -14,7 +14,7 @@ var PomodoroConfig = models.GoTomatoTimerConfig{
|
||||||
Sessions: 4,
|
Sessions: 4,
|
||||||
}
|
}
|
||||||
|
|
||||||
var pomodoroRunning bool
|
var pomodoroOngoing bool
|
||||||
var pomodoroPaused bool
|
var pomodoroPaused bool
|
||||||
|
|
||||||
var pomodoroResetChannel = make(chan bool, 1)
|
var pomodoroResetChannel = make(chan bool, 1)
|
||||||
|
@ -26,7 +26,7 @@ var mu sync.Mutex // to synchronize access to shared state
|
||||||
// RunPomodoroTimer iterates the Pomodoro work/break sessions.
|
// RunPomodoroTimer iterates the Pomodoro work/break sessions.
|
||||||
func RunPomodoroTimer(clients map[*websocket.Conn]*models.Client) {
|
func RunPomodoroTimer(clients map[*websocket.Conn]*models.Client) {
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
pomodoroRunning = true
|
pomodoroOngoing = true
|
||||||
pomodoroPaused = false
|
pomodoroPaused = false
|
||||||
mu.Unlock()
|
mu.Unlock()
|
||||||
|
|
||||||
|
@ -46,14 +46,14 @@ func RunPomodoroTimer(clients map[*websocket.Conn]*models.Client) {
|
||||||
}
|
}
|
||||||
|
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
pomodoroRunning = false
|
pomodoroOngoing = false
|
||||||
mu.Unlock()
|
mu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResetPomodoro resets the running Pomodoro timer.
|
// ResetPomodoro resets the running Pomodoro timer.
|
||||||
func ResetPomodoro(clients map[*websocket.Conn]*models.Client) {
|
func ResetPomodoro(clients map[*websocket.Conn]*models.Client) {
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
pomodoroRunning = false // Reset the running state
|
pomodoroOngoing = false // Reset the running state
|
||||||
pomodoroPaused = false // Reset the paused state
|
pomodoroPaused = false // Reset the paused state
|
||||||
mu.Unlock()
|
mu.Unlock()
|
||||||
|
|
||||||
|
@ -84,10 +84,10 @@ func ResumePomodoro() {
|
||||||
pomodoroResumeChannel <- true
|
pomodoroResumeChannel <- true
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsPomodoroRunning() bool {
|
func IsPomodoroOngoing() bool {
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
defer mu.Unlock() // Ensures that the mutex is unlocked after the function is done
|
defer mu.Unlock() // Ensures that the mutex is unlocked after the function is done
|
||||||
return pomodoroRunning
|
return pomodoroOngoing
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsPomodoroPaused() bool {
|
func IsPomodoroPaused() bool {
|
||||||
|
|
|
@ -34,19 +34,19 @@ func handleClientCommands(ws *websocket.Conn) {
|
||||||
// Process the command
|
// Process the command
|
||||||
switch command.Command {
|
switch command.Command {
|
||||||
case "start":
|
case "start":
|
||||||
if !pomodoro.IsPomodoroRunning() {
|
if !pomodoro.IsPomodoroOngoing() {
|
||||||
go pomodoro.RunPomodoroTimer(Clients) // Start the timer with the list of clients
|
go pomodoro.RunPomodoroTimer(Clients) // Start the timer with the list of clients
|
||||||
}
|
}
|
||||||
case "stop":
|
case "stop":
|
||||||
if pomodoro.IsPomodoroRunning() {
|
if pomodoro.IsPomodoroOngoing() {
|
||||||
pomodoro.ResetPomodoro(Clients) // Reset Pomodoro
|
pomodoro.ResetPomodoro(Clients) // Reset Pomodoro
|
||||||
}
|
}
|
||||||
case "pause":
|
case "pause":
|
||||||
if pomodoro.IsPomodoroRunning() && !pomodoro.IsPomodoroPaused() {
|
if pomodoro.IsPomodoroOngoing() && !pomodoro.IsPomodoroPaused() {
|
||||||
pomodoro.PausePomodoro() // Pause the timer
|
pomodoro.PausePomodoro() // Pause the timer
|
||||||
}
|
}
|
||||||
case "resume":
|
case "resume":
|
||||||
if pomodoro.IsPomodoroRunning() && pomodoro.IsPomodoroPaused() {
|
if pomodoro.IsPomodoroOngoing() && pomodoro.IsPomodoroPaused() {
|
||||||
pomodoro.ResumePomodoro() // Resume the timer
|
pomodoro.ResumePomodoro() // Resume the timer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue