pomodoro/GoTomato
3
0
Fork 0
Code Issues Pull requests Releases 15 Activity

break: rename ServerMessage.PomodoroSettings -> .Settings

Browse source
This commit is contained in:
Sebastian Mark 2024-10-26 09:15:49 +02:00
parent 06633ff438
commit 61b2f71bf3
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/pomodoro/pomodoro.go
View file

@ -29,7 +29,7 @@ func RunPomodoro() {
shared.Message.Paused = false shared.Message.Paused = false
mu.Unlock() mu.Unlock()
pomodoroConfig := shared.Message.PomodoroSettings pomodoroConfig := shared.Message.Settings
for session := 1; session <= pomodoroConfig.Sessions; session++ { for session := 1; session <= pomodoroConfig.Sessions; session++ {
timer = timer.Init() timer = timer.Init()
@ -66,7 +66,7 @@ func RunPomodoro() {
shared.Message.Mode = "Idle" shared.Message.Mode = "Idle"
shared.Message.Session = 0 shared.Message.Session = 0
shared.Message.TimeLeft = shared.Message.PomodoroSettings.Work shared.Message.TimeLeft = shared.Message.Settings.Work
} }
func ResetPomodoro() { func ResetPomodoro() {

12
internal/shared/state.go
View file

@ -5,12 +5,12 @@ import (
) )
var Message = models.ServerMessage{ var Message = models.ServerMessage{
Mode: "Idle", Mode: "Idle",
PomodoroSettings: DefaultPomodoroConfig, Settings: DefaultPomodoroConfig,
Session: 0, Session: 0,
TimeLeft: DefaultPomodoroConfig.Work, TimeLeft: DefaultPomodoroConfig.Work,
Ongoing: false, Ongoing: false,
Paused: false, Paused: false,
} }
var PomodoroPassword string var PomodoroPassword string

2
internal/websocket/client_commands.go
View file

@ -50,7 +50,7 @@ func handleClientCommands(ws *websocket.Conn) {
case "updateSettings": case "updateSettings":
if !pomodoro.IsPomodoroOngoing() { if !pomodoro.IsPomodoroOngoing() {
if clientCommand.PomodoroSettings != (models.GoTomatoPomodoroConfig{}) { if clientCommand.PomodoroSettings != (models.GoTomatoPomodoroConfig{}) {
shared.Message.PomodoroSettings = clientCommand.PomodoroSettings shared.Message.Settings = clientCommand.PomodoroSettings
shared.Message.TimeLeft = clientCommand.PomodoroSettings.Work shared.Message.TimeLeft = clientCommand.PomodoroSettings.Work
} }

14
pkg/models/server.go
View file

@ -2,11 +2,11 @@ package models
// ServerMessage represents the data sent to the client via WebSocket. // ServerMessage represents the data sent to the client via WebSocket.
type ServerMessage struct { type ServerMessage struct {
Mode string `json:"mode"` // "Idle", "Work", "ShortBreak", "LongBreak" or "End" Mode string `json:"mode"` // "Idle", "Work", "ShortBreak", "LongBreak" or "End"
PomodoroSettings GoTomatoPomodoroConfig `json:"settings"` // The currrent pomodoro settings Settings GoTomatoPomodoroConfig `json:"settings"` // The currrent pomodoro settings
Session int `json:"session"` // Current session number Session int `json:"session"` // Current session number
TimeLeft int `json:"time_left"` // Remaining time in seconds TimeLeft int `json:"time_left"` // Remaining time in seconds
Ongoing bool `json:"ongoing"` // Ongoing pomodoro Ongoing bool `json:"ongoing"` // Ongoing pomodoro
Paused bool `json:"paused"` // Is timer paused Paused bool `json:"paused"` // Is timer paused
GoTomatoVersion string `json:"version"` // Version of the server GoTomatoVersion string `json:"version"` // Version of the server
} }