cmd/server/main.go

@@ -3,25 +3,21 @@ package server
 import (
 	"flag"
 	"fmt"
-	"github.com/charmbracelet/log"
-	"net/http"
-	"os"
-
 	"git.smsvc.net/pomodoro/GoTomato/internal/metadata"
 	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
 	"git.smsvc.net/pomodoro/GoTomato/internal/websocket"
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
-)
-
-var (
-	// Define CLI flags
-	listenAddress   = flag.String("listenAddress", shared.DefaultServerConfig.ListenAddress, "IP address to listen on")
-	listenPort      = flag.Int("listenPort", shared.DefaultServerConfig.ListenPort, "Port to listen on")
-	password        = flag.String("password", "", "Control password for pomodoro session (optional)")
-	showVersionFlag = flag.Bool("version", false, "Output version")
+	"github.com/charmbracelet/log"
+	"net/http"
+	"os"
 )
 
 func Start() {
+	// Define CLI flags for ListenAddress and ListenPort
+	listenAddress := flag.String("listenAddress", shared.DefaultServerConfig.ListenAddress, "IP address to listen on")
+	listenPort := flag.Int("listenPort", shared.DefaultServerConfig.ListenPort, "Port to listen on")
+	password := flag.String("password", "", "Control password for pomodoro session (optional)")
+	showVersionFlag := flag.Bool("version", false, "Output version")
 	flag.Parse()
 
 	if *showVersionFlag {

internal/pomodoro/pomodoro.go

@@ -1,11 +1,9 @@
 package pomodoro
 
 import (
+	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
 	"sync"
 	"time"
-
-	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
-	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
 var mu sync.Mutex // to synchronize access to shared state
@@ -101,10 +99,3 @@ func IsPomodoroPaused() bool {
 	defer mu.Unlock() // Ensures that the mutex is unlocked after the function is done
 	return shared.Message.Paused
 }
-
-func UpdateSettings(settings models.PomodoroConfig) {
-	if settings != (models.PomodoroConfig{}) {
-		shared.Message.Settings = settings
-		shared.Message.TimeLeft = settings.Work
-	}
-}

internal/pomodoro/timer.go

@@ -1,6 +1,8 @@
 package pomodoro
 
-import "time"
+import (
+	"time"
+)
 
 type Timer struct {
 	TimeLeft chan int  // time left

internal/shared/configDefaults.go

@@ -1,6 +1,8 @@
 package shared
 
-import "git.smsvc.net/pomodoro/GoTomato/pkg/models"
+import (
+	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
+)
 
 var DefaultServerConfig = models.ServerConfig{
 	ListenAddress: "0.0.0.0",

internal/websocket/broadcast.go

@@ -2,11 +2,10 @@ package websocket
 
 import (
 	"encoding/json"
+	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
 	"github.com/charmbracelet/log"
 	"github.com/gorilla/websocket"
 	"time"
-
-	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
 )
 
 // sends continous messages to all connected WebSocket clients.

internal/websocket/client_commands.go

@@ -2,12 +2,11 @@ package websocket
 
 import (
 	"encoding/json"
-	"github.com/charmbracelet/log"
-	"github.com/gorilla/websocket"
-
 	"git.smsvc.net/pomodoro/GoTomato/internal/pomodoro"
 	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
+	"github.com/charmbracelet/log"
+	"github.com/gorilla/websocket"
 )
 
 // handleClientCommands listens for commands from WebSocket clients
@@ -50,7 +49,11 @@ func handleClientCommands(ws *websocket.Conn) {
 				}
 			case "updateSettings":
 				if !pomodoro.IsPomodoroOngoing() {
-					pomodoro.UpdateSettings(clientCommand.Settings)
+					if clientCommand.Settings != (models.PomodoroConfig{}) {
+						shared.Message.Settings = clientCommand.Settings
+						shared.Message.TimeLeft = clientCommand.Settings.Work
+					}
+
 				}
 			}
 		}

internal/websocket/handle_connections.go

@@ -1,12 +1,11 @@
 package websocket
 
 import (
+	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 	"github.com/charmbracelet/log"
 	"github.com/gorilla/websocket"
 	"net/http"
 	"sync"
-
-	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
 // Clients is a map of connected WebSocket clients, where each client is represented by the Client struct