diff --git a/go.mod b/go.mod index 5e40fd0..c033073 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.1 require ( atomicgo.dev/cursor v0.2.0 atomicgo.dev/keyboard v0.2.9 - git.smsvc.net/pomodoro/GoTomato v0.0.4 + git.smsvc.net/pomodoro/GoTomato v0.0.3 github.com/charmbracelet/log v0.4.0 github.com/fatih/color v1.18.0 github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4 diff --git a/go.sum b/go.sum index 6d09809..ac46fce 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ atomicgo.dev/cursor v0.2.0 h1:H6XN5alUJ52FZZUkI7AlJbUc1aW38GWZalpYRPpoPOw= atomicgo.dev/cursor v0.2.0/go.mod h1:Lr4ZJB3U7DfPPOkbH7/6TOtJ4vFGHlgj1nc+n900IpU= atomicgo.dev/keyboard v0.2.9 h1:tOsIid3nlPLZ3lwgG8KZMp/SFmr7P0ssEN5JUsm78K8= atomicgo.dev/keyboard v0.2.9/go.mod h1:BC4w9g00XkxH/f1HXhW2sXmJFOCWbKn9xrOunSFtExQ= -git.smsvc.net/pomodoro/GoTomato v0.0.4 h1:+pCbPXUMtPteQilMe3QNo6fl67kB9gO6C/g0sNj1zck= -git.smsvc.net/pomodoro/GoTomato v0.0.4/go.mod h1:rNFUjjBMKplygWYbgErWd4cD8JQ66h0KyiK54cGktJo= +git.smsvc.net/pomodoro/GoTomato v0.0.3 h1:9tYd26YM52CT1g/eNFrc14sSrGQUELuIVh6KT91DpII= +git.smsvc.net/pomodoro/GoTomato v0.0.3/go.mod h1:TV6+3bYjwc+kJ7I60H9YSd7BdBBzPnisx/MRnBbEeDk= github.com/MarvinJWendt/testza v0.1.0/go.mod h1:7AxNvlfeHP7Z/hDQ5JtE3OKYT3XFUeLCDE2DQninSqs= github.com/MarvinJWendt/testza v0.2.1/go.mod h1:God7bhG8n6uQxwdScay+gjm9/LnO4D3kkcZX4hv9Rp8= github.com/MarvinJWendt/testza v0.2.8/go.mod h1:nwIcjmr0Zz+Rcwfh3/4UhBp7ePKVhuBExvZqnKYWlII= diff --git a/internal/frontend/keyhandler.go b/internal/frontend/keyhandler.go index 49bec97..0c0ed45 100644 --- a/internal/frontend/keyhandler.go +++ b/internal/frontend/keyhandler.go @@ -36,7 +36,7 @@ func keyhandler(conn *ws.Conn, config ChronoTomato.Config, message *GoTomato.Ser case "s": websocket.SendCmd(conn, config.Password, "stop") case "r": - if config.PomodoroConfig != (GoTomato.PomodoroConfig{}) { + if config.PomodoroConfig != (GoTomato.GoTomatoPomodoroConfig{}) { websocket.Send_updateSettings(conn, config.Password, config.PomodoroConfig) } case "q": diff --git a/internal/frontend/notification.go b/internal/frontend/notification.go index bbf53bf..250c5db 100644 --- a/internal/frontend/notification.go +++ b/internal/frontend/notification.go @@ -16,17 +16,17 @@ func desktopNotifications(pomodoro GoTomato.ServerMessage) { mode := pomodoro.Mode session := pomodoro.Session - sessions := pomodoro.Settings.Sessions + sessions := pomodoro.PomodoroSettings.Sessions switch mode { case "Work": - duration = pomodoro.Settings.Work + duration = pomodoro.PomodoroSettings.Work notification = fmt.Sprintf("Session %d/%d: %s %0.f minutes", session, sessions, mode, float32(duration)/60) case "ShortBreak": - duration = pomodoro.Settings.ShortBreak + duration = pomodoro.PomodoroSettings.ShortBreak notification = fmt.Sprintf("Session %d/%d: Take a %0.f minute break", session, sessions, float32(duration)/60) case "LongBreak": - duration = pomodoro.Settings.LongBreak + duration = pomodoro.PomodoroSettings.LongBreak notification = fmt.Sprintf("Long Break: Take a %0.f minute break", float32(duration)/60) case "End": duration = 0 diff --git a/internal/frontend/terminal.go b/internal/frontend/terminal.go index bac0907..70d9deb 100644 --- a/internal/frontend/terminal.go +++ b/internal/frontend/terminal.go @@ -18,9 +18,9 @@ func terminalOutput(pomodoro GoTomato.ServerMessage) { // header color.Blue("Work: %d ◊ Break: %d ◊ Longbreak: %d\n\n", - pomodoro.Settings.Work/60, - pomodoro.Settings.ShortBreak/60, - pomodoro.Settings.LongBreak/60, + pomodoro.PomodoroSettings.Work/60, + pomodoro.PomodoroSettings.ShortBreak/60, + pomodoro.PomodoroSettings.LongBreak/60, ) //body @@ -41,7 +41,7 @@ func terminalOutput(pomodoro GoTomato.ServerMessage) { fmt.Printf("Session: %d/%d\n", pomodoro.Session, - pomodoro.Settings.Sessions, + pomodoro.PomodoroSettings.Sessions, ) fmt.Printf("%s %s\n", modePrefix, pomodoro.Mode) fmt.Printf(timerOutput) diff --git a/internal/websocket/send.go b/internal/websocket/send.go index 942b4b6..90df844 100644 --- a/internal/websocket/send.go +++ b/internal/websocket/send.go @@ -31,11 +31,11 @@ func SendCmd(conn *websocket.Conn, pwd string, cmd string) { sendClientCommand(conn, message) } -func Send_updateSettings(conn *websocket.Conn, pwd string, settings GoTomato.PomodoroConfig) { +func Send_updateSettings(conn *websocket.Conn, pwd string, settings GoTomato.GoTomatoPomodoroConfig) { message := GoTomato.ClientCommand{ - Command: "updateSettings", - Password: pwd, - Settings: settings, + Command: "updateSettings", + Password: pwd, + PomodoroSettings: settings, } sendClientCommand(conn, message) diff --git a/pkg/models/configfile.go b/pkg/models/configfile.go index 4e824db..b8ea721 100644 --- a/pkg/models/configfile.go +++ b/pkg/models/configfile.go @@ -3,7 +3,7 @@ package models import GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" type Config struct { - URL string `yaml:"url"` - Password string `yaml:"password"` - PomodoroConfig GoTomato.PomodoroConfig `yaml:"config"` + URL string `yaml:"url"` + Password string `yaml:"password"` + PomodoroConfig GoTomato.GoTomatoPomodoroConfig `yaml:"config"` }