refactor: improve cli parameter handling
- streamline `main` functions - refactor cli parameter handling
This commit is contained in:
parent
34d4206f65
commit
c2310f7735
1 changed files with 16 additions and 12 deletions
|
@ -12,27 +12,31 @@ import (
|
|||
GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models"
|
||||
)
|
||||
|
||||
var (
|
||||
config ChronoTomato.Config
|
||||
parameter_url = flag.String("url", "", "GoTomato Server URL (eg ws://localhost:8080/ws)")
|
||||
parameter_password = flag.String("password", "", "Control password for pomodoro session")
|
||||
configfile = flag.String("config", "", "Path to config file")
|
||||
)
|
||||
|
||||
func Start() {
|
||||
flag.Parse()
|
||||
|
||||
cursor.Hide()
|
||||
defer cursor.Show()
|
||||
|
||||
var config ChronoTomato.Config
|
||||
channel := make(chan GoTomato.ServerMessage, 2)
|
||||
|
||||
parameter_url := flag.String("url", "", "GoTomato Server URL (eg ws://localhost:8080/ws)")
|
||||
parameter_password := flag.String("password", "", "Control password for pomodoro session (optional)")
|
||||
configfile := flag.String("config", "", "path to config file (optional)")
|
||||
flag.Parse()
|
||||
|
||||
if *configfile != "" {
|
||||
// read cli parameters if no config file passed
|
||||
if *configfile == "" {
|
||||
config.URL = *parameter_url
|
||||
config.Password = *parameter_password
|
||||
} else {
|
||||
// otherwise read config
|
||||
config = helper.ParseConfig(*configfile)
|
||||
}
|
||||
|
||||
config.URL = *parameter_url
|
||||
config.Password = *parameter_password
|
||||
|
||||
conn := websocket.Connect(config.URL)
|
||||
|
||||
channel := make(chan GoTomato.ServerMessage, 2)
|
||||
go websocket.ProcessServerMessages(conn, channel)
|
||||
frontend.Handler(conn, config, channel)
|
||||
|
||||
|
|
Loading…
Reference in a new issue