implement core logic (#3)

This commit is contained in:
Adem Baccara
2025-08-27 16:56:42 +01:00
committed by GitHub
parent e9225188e8
commit 8e3f7ebc37
27 changed files with 1675 additions and 245 deletions
+84 -47
View File
@@ -16,9 +16,10 @@ package ui
import (
"fmt"
"net"
"regexp"
"strconv"
"strings"
"time"
"github.com/Adembc/lazyssh/internal/core/domain"
"github.com/gdamore/tcell/v2"
@@ -51,10 +52,7 @@ func NewServerForm(mode ServerFormMode, original *domain.Server) *ServerForm {
}
func (sf *ServerForm) build() {
title := "Add Server"
if sf.mode == ServerFormEdit {
title = "Edit Server"
}
title := sf.titleForMode()
sf.Form.SetBorder(true).
SetTitle(title).
@@ -69,24 +67,29 @@ func (sf *ServerForm) build() {
sf.Form.SetCancelFunc(sf.handleCancel)
}
func (sf *ServerForm) titleForMode() string {
if sf.mode == ServerFormEdit {
return "Edit Server"
}
return "Add Server"
}
func (sf *ServerForm) addFormFields() {
var defaultValues ServerFormData
if sf.mode == ServerFormEdit && sf.original != nil {
defaultValues = ServerFormData{
Alias: sf.original.Alias,
Host: sf.original.Host,
User: sf.original.User,
Port: fmt.Sprint(sf.original.Port),
Key: sf.original.Key,
Tags: strings.Join(sf.original.Tags, ", "),
Status: sf.original.Status,
Alias: sf.original.Alias,
Host: sf.original.Host,
User: sf.original.User,
Port: fmt.Sprint(sf.original.Port),
Key: sf.original.Key,
Tags: strings.Join(sf.original.Tags, ", "),
}
} else {
defaultValues = ServerFormData{
User: "root",
Port: "22",
Key: "~/.ssh/id_ed25519",
Status: "online",
User: "root",
Port: "22",
Key: "~/.ssh/id_ed25519",
}
}
@@ -96,28 +99,15 @@ func (sf *ServerForm) addFormFields() {
sf.Form.AddInputField("Port:", defaultValues.Port, 20, nil, nil)
sf.Form.AddInputField("Key:", defaultValues.Key, 40, nil, nil)
sf.Form.AddInputField("Tags (comma):", defaultValues.Tags, 30, nil, nil)
statusDD := tview.NewDropDown().SetLabel("Status: ")
statusOptions := []string{"online", "warn", "offline"}
statusDD.SetOptions(statusOptions, nil)
for i, opt := range statusOptions {
if opt == defaultValues.Status {
statusDD.SetCurrentOption(i)
break
}
}
sf.Form.AddFormItem(statusDD)
}
type ServerFormData struct {
Alias string
Host string
User string
Port string
Key string
Tags string
Status string
Alias string
Host string
User string
Port string
Key string
Tags string
}
func (sf *ServerForm) getFormData() ServerFormData {
@@ -133,14 +123,18 @@ func (sf *ServerForm) getFormData() ServerFormData {
func (sf *ServerForm) handleSave() {
data := sf.getFormData()
if data.Alias == "" || data.Host == "" {
if errMsg := validateServerForm(data); errMsg != "" {
sf.Form.SetTitle(fmt.Sprintf("%s — [red::b]%s[-]", sf.titleForMode(), errMsg))
sf.Form.SetBorderColor(tcell.ColorRed)
return
}
sf.Form.SetTitle(sf.titleForMode())
sf.Form.SetBorderColor(tcell.Color238)
server := sf.dataToServer(data)
if sf.original == nil {
server.LastSeen = time.Now()
}
if sf.onSave != nil {
sf.onSave(server, sf.original)
}
@@ -169,18 +163,61 @@ func (sf *ServerForm) dataToServer(data ServerFormData) domain.Server {
}
}
_, status := sf.Form.GetFormItem(6).(*tview.DropDown).GetCurrentOption()
return domain.Server{
Alias: data.Alias,
Host: data.Host,
User: data.User,
Port: port,
Key: data.Key,
Tags: tags,
Status: status,
Alias: data.Alias,
Host: data.Host,
User: data.User,
Port: port,
Key: data.Key,
Tags: tags,
}
}
// validateServerForm returns an error message string if validation fails; empty string means valid.
func validateServerForm(data ServerFormData) string {
alias := data.Alias
if alias == "" {
return "Alias is required"
}
if !regexp.MustCompile(`^[A-Za-z0-9_.-]+$`).MatchString(alias) {
return "Alias may contain letters, digits, dot, dash, underscore"
}
host := data.Host
if host == "" {
return "Host/IP is required"
}
if ip := net.ParseIP(host); ip == nil {
if strings.Contains(host, " ") {
return "Host must not contain spaces"
}
if !regexp.MustCompile(`^[A-Za-z0-9.-]+$`).MatchString(host) {
return "Host contains invalid characters"
}
if strings.HasPrefix(host, ".") || strings.HasSuffix(host, ".") {
return "Host must not start or end with a dot"
}
for _, lbl := range strings.Split(host, ".") {
if lbl == "" {
return "Host must not contain empty labels"
}
if strings.HasPrefix(lbl, "-") || strings.HasSuffix(lbl, "-") {
return "Hostname labels must not start or end with a hyphen"
}
}
}
if data.Port != "" {
p, err := strconv.Atoi(data.Port)
if err != nil || p < 1 || p > 65535 {
return "Port must be a number between 1 and 65535"
}
}
return ""
}
func (sf *ServerForm) OnSave(fn func(domain.Server, *domain.Server)) *ServerForm {
sf.onSave = fn
return sf