up

correct band guess
remove HTTP server
2024-11-30 21:49:00 +07:00 · 2024-11-16 23:03:12 +07:00 · 2024-11-16 12:24:42 +07:00 · 2024-11-15 20:41:34 +07:00 · 2024-11-13 09:19:43 +07:00 · 2024-11-06 15:07:36 +07:00
27 changed files with 466 additions and 584 deletions
--- a/2
+++ b/2
@ -4,7 +4,7 @@ WORKDIR /app

 COPY go.mod go.sum ./

-COPY clublog.go config.go config.yml database.go flexradio.go HTTPServer.go spot.go main.go TCPClient.go TCPServer.go utils.go log.go ./
+COPY config.go config.yml database.go flexradio.go spot.go main.go TCPClient.go TCPServer.go utils.go log.go xml.go ./
 COPY templates/* .

 RUN go build -o bin main.go
--- a/HTTPServer.go
+++ b/HTTPServer.go
@ -1,133 +0,0 @@
-package main
-
-import (
-	"embed"
-	"fmt"
-	"html/template"
-	"net/http"
-
-	"github.com/gorilla/mux"
-	log "github.com/sirupsen/logrus"
-)
-
-//go:embed templates/*
-var tplFolder embed.FS
-
-//go:embed images/*
-var imgFolder embed.FS
-
-var tmpl *template.Template
-var listNew = []New{}
-
-type New struct {
-	DX      string
-	Status  string
-	NewDXCC bool
-	NewMode bool
-	NewBand bool
-	Worked  bool
-	MyCall  bool
-}
-
-type HTTPServer struct {
-	router               *mux.Router
-	Log4OMRepo           Log4OMContactsRepository
-	Repo                 FlexDXClusterRepository
-	Log                  *log.Logger
-	TCPServer            TCPServer
-	SpotChanToHTTPServer chan TelnetSpot
-}
-
-func NewHTTPServer(cRepo Log4OMContactsRepository, fRepo FlexDXClusterRepository, TCPServer *TCPServer, SpotChanToHTTPServer chan TelnetSpot, log *log.Logger) *HTTPServer {
-
-	gRouter := mux.NewRouter()
-
-	return &HTTPServer{
-		router:               gRouter,
-		Log4OMRepo:           cRepo,
-		Repo:                 fRepo,
-		Log:                  log,
-		TCPServer:            *TCPServer,
-		SpotChanToHTTPServer: SpotChanToHTTPServer,
-	}
-}
-
-func (s *HTTPServer) SetRoutes() {
-	s.router.HandleFunc("/", s.Homepage)
-	s.router.HandleFunc("/spots", s.GetSpots).Methods("GET")
-	s.router.HandleFunc("/spotscount", s.GetSpotsCount).Methods("GET")
-	s.router.HandleFunc("/spotters", s.GetSpotters).Methods("GET")
-	s.router.HandleFunc("/new", s.GetNew).Methods("GET")
-
-	s.router.PathPrefix("/images/").Handler(http.StripPrefix("/images/", http.FileServer(http.Dir("./images/"))))
-}
-
-func (s *HTTPServer) StartHTTPServer() {
-
-	go func() {
-		for spot := range s.SpotChanToHTTPServer {
-			s.GetListofNew(spot)
-		}
-	}()
-
-	tmpl, _ = template.ParseGlob("templates/*.html")
-
-	s.SetRoutes()
-	s.Log.Infof("starting HTTP server on %s:%s", Cfg.HTTPServer.Host, Cfg.HTTPServer.Port)
-	err := http.ListenAndServe(Cfg.HTTPServer.Host+":"+Cfg.HTTPServer.Port, s.router)
-	if err != nil {
-		s.Log.Warn("cannot start HTTP server: ", err)
-	}
-}
-
-func (s *HTTPServer) Homepage(w http.ResponseWriter, r *http.Request) {
-	err := tmpl.ExecuteTemplate(w, "home.html", nil)
-	if err != nil {
-		s.Log.Error("error executing home template: ", err)
-	}
-}
-
-func (s *HTTPServer) GetSpots(w http.ResponseWriter, r *http.Request) {
-	spots := s.Repo.GetAllSpots("35")
-	tmpl.ExecuteTemplate(w, "spot", spots)
-}
-
-func (s *HTTPServer) GetSpotsCount(w http.ResponseWriter, r *http.Request) {
-	spots := s.Repo.GetAllSpots("0")
-	count := len(spots)
-	tmpl.ExecuteTemplate(w, "spotCount", count)
-}
-
-func (s *HTTPServer) GetSpotters(w http.ResponseWriter, r *http.Request) {
-	spotters := s.Repo.GetSpotters()
-	tmpl.ExecuteTemplate(w, "spotters", spotters)
-}
-
-func (s *HTTPServer) GetNew(w http.ResponseWriter, r *http.Request) {
-	tmpl.ExecuteTemplate(w, "new", listNew)
-}
-
-func (s *HTTPServer) GetListofNew(spot TelnetSpot) {
-	new := New{}
-
-	new.DX = spot.DX
-
-	if spot.NewDXCC {
-		new.Status = fmt.Sprintf("New DXCC (%s) (%s)", spot.Band, spot.Mode)
-		new.NewDXCC = true
-	} else if !spot.NewBand && spot.NewMode && spot.Mode != "" {
-		new.Status = fmt.Sprintf("New Mode (%s) (%s)", spot.Band, spot.Mode)
-		new.NewMode = true
-	} else if spot.NewBand && spot.NewMode && spot.Mode != "" {
-		new.Status = fmt.Sprintf("New Band (%s) & Mode (%s)", spot.Band, spot.Mode)
-		new.NewBand = true
-		new.NewMode = true
-	}
-
-	if new.Status != "" {
-		if len(listNew) > 10 {
-			listNew = append(listNew[:0], listNew[1:]...)
-		}
-		listNew = append(listNew, new)
-	}
-}
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+build:
+	go build .
--- a/TCPClient.go
+++ b/TCPClient.go
@ -12,7 +12,6 @@ import (
 )

 var spotRe *regexp.Regexp = regexp.MustCompile(`DX\sde\s([\w\d]+).*:\s+(\d+.\d)\s+([\w\d\/]+)\s+(CW|SSB|FT8|FT4|RTTY|USB|LSB)?\s+(.*)\s\s\s+([\d]+\w{1})`)
-var count int = 0

 type TCPClient struct {
 	Login                string
@ -34,7 +33,7 @@ type TCPClient struct {
 	Countries            Countries
 }

-func NewTCPClient(TCPServer *TCPServer, log *log.Logger, Countries Countries) *TCPClient {
+func NewTCPClient(TCPServer *TCPServer, Countries Countries) *TCPClient {
 	return &TCPClient{
 		Address:              Cfg.Cluster.Server,
 		Port:                 Cfg.Cluster.Port,
@ -42,7 +41,6 @@ func NewTCPClient(TCPServer *TCPServer, log *log.Logger, Countries Countries) *T
 		MsgChan:              TCPServer.MsgChan,
 		CmdChan:              TCPServer.CmdChan,
 		SpotChanToFlex:       make(chan TelnetSpot, 100),
-		Log:                  log,
 		TCPServer:            *TCPServer,
 		SpotChanToHTTPServer: make(chan TelnetSpot, 100),
 		Countries:            Countries,
@ -63,19 +61,19 @@ func (c *TCPClient) StartClient() {

 	addr, err := net.ResolveTCPAddr("tcp", c.Address+":"+c.Port)
 	if err != nil {
-		c.Log.Error("Cannot resolve Telnet Client address:", err)
+		Log.Error("Cannot resolve Telnet Client address:", err)
 	}

 	c.setDefaultParams()
 	c.Conn, err = net.DialTCP("tcp", nil, addr)
 	if err != nil {
-		c.Log.Error("Cannot connect to Telnet Client:", err)
+		Log.Error("Cannot connect to Telnet Client:", err)
 	}
-	c.Log.Infof("Connected to DX cluster %s:%s", c.Address, c.Port)
+	Log.Infof("Connected to DX cluster %s:%s", c.Address, c.Port)

 	err = c.Conn.SetKeepAlive(true)
 	if err != nil {
-		c.Log.Error("Error while setting keep alive:", err)
+		Log.Error("Error while setting keep alive:", err)
 	}

 	c.Reader = bufio.NewReader(c.Conn)
@ -83,7 +81,7 @@ func (c *TCPClient) StartClient() {

 	go func() {
 		for message := range c.TCPServer.CmdChan {
-			c.Log.Infof("Received DX Command: %s", message)
+			Log.Infof("Received DX Command: %s", message)
 			message := message + "\n"
 			c.WriteString(message)
 		}
@ -100,32 +98,32 @@ func (c *TCPClient) Close() {
 func (c *TCPClient) SetFilters() {
 	if Cfg.Cluster.FT8 {
 		c.Write([]byte("set/ft8\r\n"))
-		c.Log.Info("FT8: On")
+		Log.Info("FT8: On")
 	}

 	if Cfg.Cluster.Skimmer {
 		c.Write([]byte("set/skimmer\r\n"))
-		c.Log.Info("Skimmer: On")
+		Log.Info("Skimmer: On")
 	}

 	if Cfg.Cluster.FT4 {
 		c.Write([]byte("set/ft4\r\n"))
-		c.Log.Info("FT4: On")
+		Log.Info("FT4: On")
 	}

 	if !Cfg.Cluster.FT8 {
 		c.Write([]byte("set/noft8\r\n"))
-		c.Log.Info("FT8: Off")
+		Log.Info("FT8: Off")
 	}

 	if !Cfg.Cluster.FT4 {
 		c.Write([]byte("set/noft4\r\n"))
-		c.Log.Info("FT4: Off")
+		Log.Info("FT4: Off")
 	}

 	if !Cfg.Cluster.Skimmer {
 		c.Write([]byte("set/noskimmer\r\n"))
-		c.Log.Info("Skimmer: Off")
+		Log.Info("Skimmer: Off")
 	}
 }

@ -133,37 +131,33 @@ func (c *TCPClient) ReadLine() {

 	for {
 		message, err := c.Reader.ReadString('\n')
+		message, _ = strings.CutSuffix(message, "\n")
+		message, _ = strings.CutSuffix(message, "\r")
 		if err != nil {
-			c.Log.Errorf("Error reading message: %s", err)
-			continue
+			Log.Errorf("Error reading message: %s", err)
+			c.Conn.Close()
+			c.StartClient()
 		}

-		if strings.Contains(message, Cfg.Cluster.LoginPrompt+" \r\n") {
-			c.Log.Debug("Found login prompt...sending callsign")
+		if strings.Contains(message, Cfg.Cluster.LoginPrompt) {
+			Log.Debug("Found login prompt...sending callsign")
 			c.Write([]byte(c.Login + "\r\n"))
-			time.Sleep(time.Second * 2)
 			c.SetFilters()
-			time.Sleep(time.Second * 1)
 			if Cfg.Cluster.Command != "" {
 				c.WriteString(Cfg.Cluster.Command)
 			}
-			c.Log.Info("Start receiving spots")
+			Log.Info("Start receiving spots")
+		} else if strings.Contains(message, "Error reading from server: read tcp") {
+			Log.Error("Disconnected from Telnet Server, reconnecting")
+			c.Close()
+			c.StartClient()
+		} else {
+			ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries)
 		}

-		// start := time.Now()
-		go ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries)
-		// elapsed := time.Since(start)
-		// Log.Infof("Total time for processing spot: %s", elapsed)
-
 		// Send the spot message to TCP server
-		if len(c.TCPServer.Clients) > 0 {
-			if count == 0 {
-				// wait 3 seconds before sending messages to allow the client to connect
-				time.Sleep(time.Second * 5)
-				count++
-			}
-			c.MsgChan <- message
-		}
+		c.MsgChan <- message
+
 	}
 }

--- a/TCPServer.go
+++ b/TCPServer.go
@ -31,14 +31,13 @@ type TCPServer struct {
 	Config    *Config
 }

-func NewTCPServer(address string, port string, log *log.Logger) *TCPServer {
+func NewTCPServer(address string, port string) *TCPServer {
 	return &TCPServer{
 		Address: address,
 		Port:    port,
 		Clients: make(map[net.Conn]bool),
 		MsgChan: make(chan string, 100),
 		CmdChan: make(chan string),
-		Log:     log,
 		Mutex:   new(sync.Mutex),
 	}
 }
@ -47,12 +46,12 @@ func (s *TCPServer) StartServer() {
 	s.LogWriter = bufio.NewWriter(os.Stdout)
 	s.Listener, err = net.Listen("tcp", Cfg.TelnetServer.Host+":"+Cfg.TelnetServer.Port)
 	if err != nil {
-		s.Log.Info("Could not create telnet server")
+		Log.Info("Could not create telnet server")
 	}

 	defer s.Listener.Close()

-	s.Log.Infof("Telnet server listening on %s:%s", Cfg.TelnetServer.Host, Cfg.TelnetServer.Port)
+	Log.Infof("Telnet server listening on %s:%s", Cfg.TelnetServer.Host, Cfg.TelnetServer.Port)

 	go func() {
 		for message := range s.MsgChan {
@ -62,9 +61,9 @@ func (s *TCPServer) StartServer() {

 	for {
 		s.Conn, err = s.Listener.Accept()
-		s.Log.Info("Client connected", s.Conn.RemoteAddr().String())
+		Log.Info("Client connected", s.Conn.RemoteAddr().String())
 		if err != nil {
-			s.Log.Error("Could not accept connections to telnet server")
+			Log.Error("Could not accept connections to telnet server")
 			continue
 		}
 		s.Mutex.Lock()
@ -99,7 +98,7 @@ func (s *TCPServer) handleConnection() {
 			delete(s.Clients, s.Conn)
 			s.Mutex.Unlock()
 			s.Conn.Close()
-			s.Log.Infof("client %s disconnected", s.Conn.RemoteAddr().String())
+			Log.Infof("client %s disconnected", s.Conn.RemoteAddr().String())
 		}

 		if strings.Contains(message, "DX") || strings.Contains(message, "SH/DX") || strings.Contains(message, "set") || strings.Contains(message, "SET") {
@ -122,9 +121,9 @@ func (s *TCPServer) broadcastMessage(message string) {
 	s.Mutex.Lock()
 	defer s.Mutex.Unlock()
 	for client := range s.Clients {
-		_, err := client.Write([]byte(message))
+		_, err := client.Write([]byte(message + "\r\n"))
 		if err != nil {
-			fmt.Println("error while sending message to clients:", client.RemoteAddr())
+			fmt.Println("Error while sending message to clients:", client.RemoteAddr())
 		}
 	}
 }
--- a/config.go
+++ b/config.go
@ -15,7 +15,6 @@ type Config struct {
 		DeleteLogFileAtStart bool   `yaml:"delete_log_file_at_start"`
 		LogToFile            bool   `yaml:"log_to_file"`
 		LogLevel             string `yaml:"log_level"`
-		HTTPServer           bool   `yaml:"httpserver"`
 		TelnetServer         bool   `yaml:"telnetserver"`
 		FlexRadioSpot        bool   `yaml:"flexradiospot"`
 	} `yaml:"general"`
@ -36,23 +35,15 @@ type Config struct {
 	} `yaml:"cluster"`

 	Flex struct {
+		Discover bool   `yaml:"discovery"`
 		IP       string `yaml:"ip"`
 		SpotLife string `yaml:"spot_life"`
 	} `yaml:"flex"`

-	Clublog struct {
-		Api string `yaml:"api"`
-	} `yaml:"clublog"`
-
 	TelnetServer struct {
 		Host string `yaml:"host"`
 		Port string `yaml:"port"`
 	} `yaml:"telnetserver"`
-
-	HTTPServer struct {
-		Host string `yaml:"host"`
-		Port string `yaml:"port"`
-	} `yaml:"httpserver"`
 }

 func NewConfig(configPath string) *Config {
--- a/config.yml
+++ b/config.yml
@ -1,15 +1,14 @@
 general:
  delete_log_file_at_start: true
  log_to_file: true
-  log_level: INFO
-  httpserver: true
-  telnetserver: true
-  flexradiospot: true
+  log_level: DEBUG # INFO or DEBUG or WARN
+  telnetserver: true # not in use for now
+  flexradiospot: true # not in use for now
 sqlite:
-  sqlite_path: 'C:\Perso\Seafile\Radio\Logs\Log4OM\Vietnam.SQLite'
-  callsign: XV9Q
+  sqlite_path: 'C:\Perso\Seafile\Radio\Logs\Log4OM\Vietnam.SQLite' # SQLite Db oath of Log4OM
+  callsign: XV9Q # Log4OM Callsign used to check if you get spotted by someone
 cluster:
-  server: dxc.k0xm.net
+  server: cluster.f4bpo.com # dxc.k0xm.net
  port: 7300
  login: xv9q
  skimmer: true
@ -18,13 +17,9 @@ cluster:
  command: #SET/NOFILTER
  login_prompt: "Please enter your call:"
 flex:
-  ip: 10.10.10.120 #113.161.103.129
-  spot_life: 600
-clublog:
-  api: 5767f19333363a9ef432ee9cd4141fe76b8adf38
-telnetserver:
+  discovery: true # Radio must be on same LAN than the program
+  ip: 10.10.10.120 # if discovery is true no need to put an IP
+  spot_life: 600 #seconds
+telnetserver: # Log4OM must be connected to this server ie: localhost:7301 if on same machine as this program else ip:7301
  host: 0.0.0.0
-  port: 7301
-httpserver:
-  host: 0.0.0.0
-  port: 3000
+  port: 7301
--- a/country.xml
+++ b/country.xml
@ -195,7 +195,7 @@
 	  </ItuZoneList>
 	  <Latitude>-8.22</Latitude>
 	  <Longitude>48.2</Longitude>
-	  <Active>false</Active>
+	  <Active>false</Active>	
 	  <CountryTag />
 	  <CountryPrefixList>
 		<CountryPrefix>
@ -1918,7 +1918,7 @@
 		  <EndDate>2007-12-31T23:59:59Z</EndDate>
 		</CountryPrefix>
 		<CountryPrefix>
-		  <PrefixList>^OE.*</PrefixList>
+		  <PrefixList>^OE.*|^4U1A$</PrefixList>
 		  <StartDate>2007-12-31T23:59:59Z</StartDate>
 		  <EndDate xsi:nil="true" />
 		</CountryPrefix>
@ -15915,7 +15915,7 @@
 	  <CountryTag />
 	  <CountryPrefixList>
 		<CountryPrefix>
-		  <PrefixList>^4U/U.*</PrefixList>
+		  <PrefixList>^4U/U.*|4U1UN</PrefixList>
 		  <StartDate>1978-02-04T00:00:00Z</StartDate>
 		  <EndDate xsi:nil="true" />
 		</CountryPrefix>
@ -16121,7 +16121,7 @@
 		  <EndDate>2016-09-18T23:59:59Z</EndDate>
 		</CountryPrefix>
 		<CountryPrefix>
-		  <PrefixList>^AA.*|^AB.*|^AC.*|^AC5.*|^AD.*|^AE.*|^AF.*|^AG.*|^AI.*|^AJ.*|^AK.*|^K.*|^N.*|^W.*</PrefixList>
+		  <PrefixList>^AA.*|^AB.*|^AC.*|^AC5.*|^AD.*|^AE.*|^AF.*|^AG.*|^AI.*|^AJ.*|^AK.*|^K.*|^N.*|^W.*|^4U1WB</PrefixList>
 		  <StartDate>2016-09-18T23:59:59Z</StartDate>
 		  <EndDate xsi:nil="true" />
 		</CountryPrefix>
--- a/database.go
+++ b/database.go
@ -39,7 +39,7 @@ type FlexDXClusterRepository struct {
 func NewLog4OMContactsRepository(filePath string) *Log4OMContactsRepository {
 	db, err := sql.Open("sqlite3", filePath)
 	if err != nil {
-		fmt.Println("Cannot open db", err)
+		Log.Errorf("Cannot open db", err)
 	}
 	_, err = db.Exec("PRAGMA journal_mode=WAL")
 	if err != nil {
@ -58,7 +58,7 @@ func NewFlexDXDatabase(filePath string) *FlexDXClusterRepository {
 		fmt.Println("Cannot open db", err)
 	}

-	Log.Info("Opening SQLite database")
+	Log.Debugln("Opening SQLite database")

 	_, err = db.ExecContext(
 		context.Background(),
@ -242,7 +242,7 @@ func (r *FlexDXClusterRepository) GetSpotters() []Spotter {

 	sList := []Spotter{}

-	rows, err := r.db.Query("select spotter, count(*) as occurences from spots group by spotter order by occurences desc, spotter limit 7")
+	rows, err := r.db.Query("select spotter, count(*) as occurences from spots group by spotter order by occurences desc, spotter limit 15")

 	if err != nil {
 		r.Log.Error(err)
@ -292,7 +292,7 @@ func (r *FlexDXClusterRepository) CreateSpot(spot FlexSpot) {
 	}

 	_, err = insertResult.LastInsertId()
-	Log.Debugf("Adding to database spot for: %s", spot.DX)
+	// Log.Debugf("Adding to database spot for: %s", spot.DX)
 	if err != nil {
 		Log.Errorf("impossible to retrieve last inserted id: %s", err)
 	}
@ -306,7 +306,7 @@ func (r *FlexDXClusterRepository) UpdateSpotSameBand(spot FlexSpot) error {
 		r.Log.Errorf("could not update database: %s", err)
 		return err
 	}
-	Log.Debugf("Updating spot to database: %s", spot.DX)
+	// Log.Debugf("Updating spot to database: %s", spot.DX)
 	return nil
 }

@ -387,6 +387,6 @@ func DeleteDatabase(filePath string, log *log.Logger) {
 		if err != nil {
 			log.Error("could not delete existing database")
 		}
-		log.Info("deleting existing database")
+		log.Debug("deleting existing database")
 	}
 }
--- a/flexradio.go
+++ b/flexradio.go
@ -37,6 +37,14 @@ type FlexSpot struct {
 	Worked          bool
 }

+type Discovery struct {
+	IP       string
+	NickName string
+	Model    string
+	Serial   string
+	Version  string
+}
+
 type FlexClient struct {
 	Address        string
 	Port           string
@ -54,7 +62,6 @@ type FlexClient struct {

 func NewFlexClient(repo FlexDXClusterRepository, TCPServer *TCPServer, SpotChanToFlex chan TelnetSpot) *FlexClient {
 	return &FlexClient{
-		Address:        Cfg.Flex.IP,
 		Port:           "4992",
 		SpotChanToFlex: SpotChanToFlex,
 		MsgChan:        TCPServer.MsgChan,
@ -65,54 +72,73 @@ func NewFlexClient(repo FlexDXClusterRepository, TCPServer *TCPServer, SpotChanT
 }

 func (fc *FlexClient) StartFlexClient() {
-	var err error

-	addr, err := net.ResolveTCPAddr("tcp", fc.Address+":"+fc.Port)
-	if err != nil {
-		Log.Error("Cannot resolve Telnet Client address")
-	}
+	if Cfg.Flex.IP == "" && !Cfg.Flex.Discover {
+		Log.Errorln("You must either turn FlexRadio Discovery on or provide an IP address for the Flex")

-	fc.LogWriter = bufio.NewWriter(os.Stdout)
-
-	fc.Timeout = 600 * time.Second
-
-	Log.Infof("Trying to connect to flex radio at %s:%s", fc.Address, fc.Port)
-
-	fc.Conn, err = net.DialTCP("tcp", nil, addr)
-	if err != nil {
-		Log.Errorf("Could not connect to flex radio on %s", Cfg.Flex.IP)
-		Log.Error("Retrying to connect to flex radio in 5 seconds")
-		time.Sleep(time.Second * 5)
-		fc.StartFlexClient()
-	}
-	Log.Infof("Connected to flex radio at %s:%s", fc.Address, fc.Port)
-	fc.IsConnected = true
-
-	go func() {
-		for message := range fc.SpotChanToFlex {
-			fc.SendSpottoFlex(message)
+	} else if Cfg.Flex.Discover {
+		ok, d := DiscoverFlexRadio()
+		if ok {
+			fc.Address = d.IP
+			Log.Infof("Found: %s with Nick: %s, Version: %s, Serial: %s - using IP: %s", d.Model, d.NickName, d.Version, d.Serial, d.IP)
+		} else {
+			Log.Errorln("Could not discover any FlexRadio on the network, please provide an IP address in the config file.")
+			fc.StartFlexClient()
 		}
-	}()
-
-	fc.Reader = bufio.NewReader(fc.Conn)
-	fc.Writer = bufio.NewWriter(fc.Conn)
-
-	err = fc.Conn.SetKeepAlive(true)
-	if err != nil {
-		Log.Error("error while setting keep alive")
+	} else if Cfg.Flex.IP != "" {
+		fc.Address = Cfg.Flex.IP
 	}

-	go fc.ReadLine()
+	if fc.Address != "" {
+		addr, err := net.ResolveTCPAddr("tcp", fc.Address+":"+fc.Port)
+		if err != nil {
+			Log.Error("Cannot resolve Telnet Client address")
+		}

-	subSpotAllCmd := fmt.Sprintf("C%v|sub spot all", CommandNumber)
-	fc.Write(subSpotAllCmd)
-	CommandNumber++
+		fc.LogWriter = bufio.NewWriter(os.Stdout)

-	clrSpotAllCmd := fmt.Sprintf("C%v|spot clear", CommandNumber)
-	fc.Write(clrSpotAllCmd)
-	CommandNumber++
+		fc.Timeout = 600 * time.Second

-	Log.Debug("Subscribed to spot on FlexRadio and Deleted all spots from panadapter")
+		Log.Debugf("Trying to connect to FlexRadio at %s:%s", fc.Address, fc.Port)
+
+		fc.Conn, err = net.DialTCP("tcp", nil, addr)
+		if err != nil {
+			Log.Errorf("Could not connect to FlexRadio on %s", Cfg.Flex.IP)
+			Log.Error("Retrying to connect to FlexRadio in 5 seconds")
+			time.Sleep(time.Second * 5)
+			fc.StartFlexClient()
+		}
+		Log.Infof("Connected to FlexRadio at %s:%s", fc.Address, fc.Port)
+		fc.IsConnected = true
+
+		go func() {
+			for message := range fc.SpotChanToFlex {
+				fc.SendSpottoFlex(message)
+			}
+		}()
+
+		fc.Reader = bufio.NewReader(fc.Conn)
+		fc.Writer = bufio.NewWriter(fc.Conn)
+
+		err = fc.Conn.SetKeepAlive(true)
+		if err != nil {
+			Log.Error("error while setting keep alive")
+		}
+
+		go fc.ReadLine()
+
+		subSpotAllCmd := fmt.Sprintf("C%v|sub spot all", CommandNumber)
+		fc.Write(subSpotAllCmd)
+		CommandNumber++
+
+		clrSpotAllCmd := fmt.Sprintf("C%v|spot clear", CommandNumber)
+		fc.Write(clrSpotAllCmd)
+		CommandNumber++
+
+		Log.Debug("Subscribed to spot on FlexRadio and Deleted all spots from panadapter")
+	} else {
+		Log.Errorln("You must either turn FlexRadio Discovery on or provide an IP address for the Flex")
+	}
 }

 func (fc *FlexClient) SendSpottoFlex(spot TelnetSpot) {
@ -132,8 +158,8 @@ func (fc *FlexClient) SendSpottoFlex(spot TelnetSpot) {
 		UTCTime:         spot.Time,
 		LifeTime:        Cfg.Flex.SpotLife,
 		Comment:         spot.Comment,
-		Color:           "#eaeaea",
-		BackgroundColor: "#000000",
+		Color:           "#ffeaeaea",
+		BackgroundColor: "#ff000000",
 		Priority:        "5",
 		NewDXCC:         spot.NewDXCC,
 		NewBand:         spot.NewBand,
@ -145,45 +171,45 @@ func (fc *FlexClient) SendSpottoFlex(spot TelnetSpot) {

 	// If new DXCC
 	if spot.NewDXCC {
-		flexSpot.Color = "#3bf908"
+		flexSpot.Color = "#ff3bf908"
 		flexSpot.Priority = "1"
-		flexSpot.BackgroundColor = "#000000"
+		flexSpot.BackgroundColor = "#ff000000"
 		flexSpot.Comment = flexSpot.Comment + " [New DXCC]"
 	} else if spot.DX == Cfg.SQLite.Callsign {
-		flexSpot.Color = "#ff0000"
+		flexSpot.Color = "#ffff0000"
 		flexSpot.Priority = "1"
-		flexSpot.BackgroundColor = "#000000"
+		flexSpot.BackgroundColor = "#ff000000"
 	} else if spot.CallsignWorked {
-		flexSpot.Color = "#000000"
-		flexSpot.BackgroundColor = "#00c0c0"
+		flexSpot.Color = "#ff000000"
+		flexSpot.BackgroundColor = "#ff00c0c0"
 		flexSpot.Priority = "5"
 		flexSpot.Comment = flexSpot.Comment + " [Worked]"
 	} else if spot.NewMode && spot.NewBand {
-		flexSpot.Color = "#c603fc"
+		flexSpot.Color = "#ffc603fc"
 		flexSpot.Priority = "1"
-		flexSpot.BackgroundColor = "#000000"
+		flexSpot.BackgroundColor = "#ff000000"
 		flexSpot.Comment = flexSpot.Comment + " [New Band & Mode]"
 	} else if spot.NewMode && !spot.NewBand {
-		flexSpot.Color = "#f9a908"
+		flexSpot.Color = "#fff9a908"
 		flexSpot.Priority = "2"
-		flexSpot.BackgroundColor = "#000000"
+		flexSpot.BackgroundColor = "#ff000000"
 		flexSpot.Comment = flexSpot.Comment + " [New Mode]"
 	} else if spot.NewBand && !spot.NewMode {
-		flexSpot.Color = "#f9f508"
+		flexSpot.Color = "#fff9f508"
 		flexSpot.Priority = "3"
-		flexSpot.BackgroundColor = "#000000"
+		flexSpot.BackgroundColor = "#ff000000"
 		flexSpot.Comment = flexSpot.Comment + " [New Band]"
 	} else if !spot.NewBand && !spot.NewMode && !spot.NewDXCC && !spot.CallsignWorked {
-		flexSpot.Color = "#eaeaea"
+		flexSpot.Color = "#ffeaeaea"
 		flexSpot.Priority = "5"
-		flexSpot.BackgroundColor = "#000000"
+		flexSpot.BackgroundColor = "#ff000000"
 	}

 	flexSpot.Comment = strings.ReplaceAll(flexSpot.Comment, " ", "\u00A0")

 	srcFlexSpot, err := fc.Repo.FindDXSameBand(flexSpot)
 	if err != nil {
-		Log.Debugf("could not find the DX in the database: ", err)
+		Log.Debugf("Could not find the DX in the database: ", err)
 	}

 	var stringSpot string
@ -207,7 +233,7 @@ func (fc *FlexClient) SendSpottoFlex(spot TelnetSpot) {
 	}

 	fc.SendSpot(stringSpot)
-	Log.Debugf("Sending spot to FlexRadio: %s", stringSpot)
+	// Log.Debugf("Sending spot to FlexRadio: %s", stringSpot)
 }

 func (fc *FlexClient) SendSpot(stringSpot string) {
@ -219,11 +245,11 @@ func (fc *FlexClient) ReadLine() {
 	for {
 		message, err := fc.Reader.ReadString(byte('\n'))
 		if err != nil {
-			Log.Errorf("Error reading message from flexradio closing program: %s", err)
+			Log.Errorf("Error reading message from FlexRadio, closing program: %s", err)
 			os.Exit(1)
 		}

-		Log.Debugf("Received message from FlexRadio: %s", strings.Trim(message, "\n"))
+		// Log.Debugf("Received message from FlexRadio: %s", strings.Trim(message, "\n"))

 		regRespSpot := *regexp.MustCompile(`R(\d+)\|0\|(\d+)\n`)
 		respSpot := regRespSpot.FindStringSubmatch(message)
@ -232,7 +258,7 @@ func (fc *FlexClient) ReadLine() {
 			spot, _ := fc.Repo.FindSpotByCommandNumber(respSpot[1])
 			_, err := fc.Repo.UpdateFlexSpotNumberByID(respSpot[2], *spot)
 			if err != nil {
-				Log.Errorf("Could not update flex spot number in database: %s", err)
+				Log.Errorf("Could not update Flex spot number in database: %s", err)
 			}
 		}

@ -258,9 +284,8 @@ func (fc *FlexClient) ReadLine() {
 		respDelete := regSpotDeleted.FindStringSubmatch(message)

 		if len(respDelete) > 0 {
-			spot, _ := fc.Repo.FindSpotByFlexSpotNumber(respDelete[1])
+			// spot, _ := fc.Repo.FindSpotByFlexSpotNumber(respDelete[1])
 			fc.Repo.DeleteSpotByFlexSpotNumber(respDelete[1])
-			Log.Debugf("Spot: DX: %s - Spotter: %s - Freq: %s - Band: %s - FlexID: %v deleted from database", spot.DX, spot.SpotterCallsign, spot.FrequencyHz, spot.Band, respDelete[1])
 		}
 	}
 }
@ -273,3 +298,41 @@ func (fc *FlexClient) Write(data string) (n int, err error) {
 	}
 	return
 }
+
+func DiscoverFlexRadio() (bool, *Discovery) {
+	if Cfg.Flex.Discover {
+		Log.Infoln("FlexRadio Discovery is turned on...searching for radio on the network")
+
+		pc, err := net.ListenPacket("udp", ":4992")
+		if err != nil {
+			Log.Errorf("Could not receive UDP packets to discover FlexRadio: ", err)
+		}
+
+		buf := make([]byte, 1024)
+
+		for {
+			n, _, err := pc.ReadFrom(buf)
+			if err != nil {
+				Log.Errorln("Could not read data on UDP port 4992")
+			}
+
+			discoverRe := regexp.MustCompile(`discovery_protocol_version=.*\smodel=(.*)\sserial=(.*)\sversion=(.*)\snickname=(.*)\scallsign=.*\sip=(.*)\sport=.*`)
+			match := discoverRe.FindStringSubmatch(string(buf[:n]))
+
+			if len(match) > 0 {
+				d := &Discovery{
+					NickName: match[4],
+					Model:    match[1],
+					Serial:   match[2],
+					Version:  match[3],
+					IP:       match[5],
+				}
+				return true, d
+			}
+		}
+	} else {
+		Log.Infoln("FlexRadio Discovery is turned off...using IP provided in the config file")
+	}
+
+	return false, nil
+}
--- a/go.mod
+++ b/go.mod
@ -5,25 +5,17 @@ go 1.23.1
 require (
 	github.com/mattn/go-sqlite3 v1.14.23
 	github.com/sirupsen/logrus v1.9.3
+	github.com/x-cray/logrus-prefixed-formatter v0.5.2
 	gopkg.in/yaml.v2 v2.4.0
 )

 require (
-	github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 // indirect
-	github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7 // indirect
-	github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7 // indirect
-	github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 // indirect
-	github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 // indirect
-	github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f // indirect
-	github.com/getlantern/systray v1.2.2 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
-	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
-	github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/gomega v1.35.1 // indirect
 	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/term v0.24.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,26 +1,23 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
-github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
-github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7 h1:6uJ+sZ/e03gkbqZ0kUG6mfKoqDb4XMAzMIwlajq19So=
-github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
-github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7 h1:guBYzEaLz0Vfc/jv0czrr2z7qyzTOGC9hiQ0VC+hKjk=
-github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7/go.mod h1:zx/1xUUeYPy3Pcmet8OSXLbF47l+3y6hIPpyLWoR9oc=
-github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
-github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
-github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
-github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
-github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
-github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
-github.com/getlantern/systray v1.2.2 h1:dCEHtfmvkJG7HZ8lS/sLklTH4RKUcIsKrAD9sThoEBE=
-github.com/getlantern/systray v1.2.2/go.mod h1:pXFOI1wwqwYXEhLPm9ZGjS2u/vVELeIgNMY5HvhHhcE=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/lxn/walk v0.0.0-20210112085537-c389da54e794/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
-github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
@ -29,34 +26,86 @@ github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWt
 github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
-github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
-github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg=
 github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
 golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
-gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/images/FlexDXCluster.ico
+++ b/images/FlexDXCluster.ico
--- a/images/icon.ico
+++ b/images/icon.ico
--- a/images/icon.svg
+++ b/images/icon.svg
--- a/images/logo.png
+++ b/images/logo.png
--- a/log.go
+++ b/log.go
@ -53,20 +53,20 @@ func NewLog() *log.Logger {
 }

 // Info ...
-func Info(format string, v ...interface{}) {
-	log.Infof(format, v...)
-}
+// func Info(format string, v ...interface{}) {
+// 	log.Infof(format, v...)
+// }

-// Warn ...
-func Warn(format string, v ...interface{}) {
-	log.Warnf(format, v...)
-}
+// // Warn ...
+// func Warn(format string, v ...interface{}) {
+// 	log.Warnf(format, v...)
+// }

-// Error ...
-func Error(format string, v ...interface{}) {
-	log.Errorf(format, v...)
-}
+// // Error ...
+// func Error(format string, v ...interface{}) {
+// 	log.Errorf(format, v...)
+// }

-func Debug(format string, v ...interface{}) {
-	log.Debugf(format, v...)
-}
+// func Debug(format string, v ...interface{}) {
+// 	log.Debugf(format, v...)
+// }
--- a/main.go
+++ b/main.go
@ -4,9 +4,7 @@ import (
 	"flag"
 	"log"
 	"os"
-	"os/signal"
 	"path/filepath"
-	"syscall"
 )

 func ParseFlags() (string, error) {
@ -32,14 +30,6 @@ func ParseFlags() (string, error) {
 	return configPath, nil
 }

-// func getIcon(s string) []byte {
-// 	b, err := ioutil.ReadFile(s)
-// 	if err != nil {
-// 		fmt.Print(err)
-// 	}
-// 	return b
-// }
-
 func main() {

 	// Generate our config based on the config supplied
@ -52,55 +42,31 @@ func main() {
 	cfg := NewConfig(cfgPath)

 	log := NewLog()
-	log.Info("config loaded.")
+	log.Info("Running FlexDXCluster version 0.1")
 	log.Infof("Callsign: %s", cfg.SQLite.Callsign)

 	DeleteDatabase("./flex.sqlite", log)

-	// Load country.xml to get all the DXCC
+	// Load country.xml to get all the DXCC number
 	Countries := LoadCountryFile()

+	// Database to keep track of all spots
 	fRepo := NewFlexDXDatabase("flex.sqlite")
 	defer fRepo.db.Close()

+	// Database connection to Log4OM
 	cRepo := NewLog4OMContactsRepository(cfg.SQLite.SQLitePath)
 	defer cRepo.db.Close()

-	TCPServer := NewTCPServer(cfg.TelnetServer.Host, cfg.TelnetServer.Port, log)
-	TCPClient := NewTCPClient(TCPServer, log, Countries)
+	TCPServer := NewTCPServer(cfg.TelnetServer.Host, cfg.TelnetServer.Port)
+	TCPClient := NewTCPClient(TCPServer, Countries)
 	FlexClient := NewFlexClient(*fRepo, TCPServer, TCPClient.SpotChanToFlex)
-	HTTPServer := NewHTTPServer(*cRepo, *fRepo, TCPServer, TCPClient.SpotChanToHTTPServer, log)
-
-	sigCh := make(chan os.Signal, 1)
-	signal.Notify(sigCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
-
-	if Cfg.General.FlexRadioSpot {
-		go FlexClient.StartFlexClient()
-	}
+	// HTTPServer := NewHTTPServer(*cRepo, *fRepo, TCPServer, TCPClient.SpotChanToHTTPServer)

+	go FlexClient.StartFlexClient()
 	go TCPClient.StartClient()
 	go TCPServer.StartServer()

-	if Cfg.General.HTTPServer {
-		go HTTPServer.StartHTTPServer()
-	}
-
-	for sig := range sigCh {
-		log.Infof("received signal: %v, shutting down TCP Client.", sig)
-
-		TCPClient.Close()
-
-		if err := fRepo.db.Close(); err != nil {
-			log.Error("failed to close the database connection properly")
-			os.Exit(1)
-		}
-
-		if err := cRepo.db.Close(); err != nil {
-			log.Error("failed to close Log4OM database connection properly")
-			os.Exit(1)
-		}
-
-		os.Exit(0)
-	}
+	CheckSignal(TCPClient, TCPServer, FlexClient, fRepo, cRepo)

 }
--- a/rsrc_windows_amd64.syso
+++ b/rsrc_windows_amd64.syso
--- a/spot.go
+++ b/spot.go
@ -40,6 +40,12 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te
 		}

 		spot.DXCC = GetDXCC(spot.DX, Countries)
+
+		if spot.DXCC == "" {
+			Log.Errorf("Could not identify the DXCC for %s", spot.DX)
+			return
+		}
+
 		spot.GetBand()
 		spot.GuessMode()
 		spot.CallsignWorked = false
@ -86,19 +92,12 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te
 			spot.CallsignWorked = true
 		}

-		// send spot to SpotChan to Flex Client to send the spot to Flex radio
-		if Cfg.General.FlexRadioSpot {
-			SpotChanToFlex <- spot
-		}
-
-		// send FlexSpot to HTTP Server
-		if Cfg.General.HTTPServer {
-			SpotChanToHTTPServer <- spot
-		}
+		// Send spots to FlexRadio
+		SpotChanToFlex <- spot

 		if spot.NewDXCC {
-			Log.Debugf("(** New DXCC **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - Command: %v, FlexSpot: %v",
-				spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.CommandNumber, spot.FlexSpotNumber)
+			Log.Debugf("(** New DXCC **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - DXCC: %s",
+				spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC)
 		}

 		if !spot.NewDXCC && spot.NewBand && spot.NewMode {
@ -126,60 +125,71 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te
 				spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC)
 		}
 	} else {
-		Log.Debugf("Could not decode: %s", strings.Trim(spotRaw, "\n"))
+		// Log.Infof("Could not decode: %s", strings.Trim(spotRaw, "\n"))
 	}

 }

 func (spot *TelnetSpot) GetBand() {
+	freq := FreqMhztoHz(spot.Frequency)
 	switch true {
-	case strings.HasPrefix(spot.Frequency, "1.8"):
+	case strings.HasPrefix(freq, "1.8"):
 		spot.Band = "160M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "LSB"
 		}
-	case strings.HasPrefix(spot.Frequency, "3"):
+	case strings.HasPrefix(freq, "3."):
 		spot.Band = "80M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "LSB"
 		}
-	case strings.HasPrefix(spot.Frequency, "7"):
+	case strings.HasPrefix(freq, "5."):
+		spot.Band = "60M"
+		if spot.Mode == "SSB" {
+			spot.Mode = "LSB"
+		}
+	case strings.HasPrefix(freq, "7."):
 		spot.Band = "40M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "LSB"
 		}
-	case strings.HasPrefix(spot.Frequency, "10"):
+	case strings.HasPrefix(freq, "10."):
 		spot.Band = "30M"
-	case strings.HasPrefix(spot.Frequency, "14"):
+	case strings.HasPrefix(freq, "14."):
 		spot.Band = "20M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "USB"
 		}
-	case strings.HasPrefix(spot.Frequency, "18"):
+	case strings.HasPrefix(freq, "18."):
 		spot.Band = "17M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "USB"
 		}
-	case strings.HasPrefix(spot.Frequency, "21"):
+	case strings.HasPrefix(freq, "21."):
 		spot.Band = "15M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "USB"
 		}
-	case strings.HasPrefix(spot.Frequency, "24"):
+	case strings.HasPrefix(freq, "24."):
 		spot.Band = "12M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "USB"
 		}
-	case strings.HasPrefix(spot.Frequency, "28"):
+	case strings.HasPrefix(freq, "28."):
 		spot.Band = "10M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "USB"
 		}
-	case strings.HasPrefix(spot.Frequency, "29"):
+	case strings.HasPrefix(freq, "29."):
 		spot.Band = "10M"
 		if spot.Mode == "SSB" {
 			spot.Mode = "USB"
 		}
+	case strings.HasPrefix(freq, "50."):
+		spot.Band = "6M"
+		if spot.Mode == "SSB" {
+			spot.Mode = "USB"
+		}
 	default:
 		spot.Band = "N/A"
 	}
@ -197,9 +207,35 @@ func (spot *TelnetSpot) GuessMode() {
 			if freqInt >= 1800 && freqInt <= 1840 {
 				spot.Mode = "CW"
 			}
-			if freqInt >= 1840 && freqInt <= 1840 {
+			if freqInt >= 1840 && freqInt <= 1844 {
+				spot.Mode = "FT8"
+			}
+		case "80M":
+			if freqInt >= 3500 && freqInt < 3568 {
 				spot.Mode = "CW"
 			}
+			if freqInt >= 3568 && freqInt < 3573 {
+				spot.Mode = "FT4"
+			}
+			if freqInt >= 3573 && freqInt < 3580 {
+				spot.Mode = "FT8"
+			}
+			if freqInt >= 3580 && freqInt < 3600 {
+				spot.Mode = "CW"
+			}
+			if freqInt >= 3600 && freqInt <= 3800 {
+				spot.Mode = "LSB"
+			}
+		case "60M":
+			if freqInt >= 5351.5 && freqInt < 5354 {
+				spot.Mode = "CW"
+			}
+			if freqInt >= 5354 && freqInt < 5366 {
+				spot.Mode = "LSB"
+			}
+			if freqInt >= 5366 && freqInt <= 5266.5 {
+				spot.Mode = "FT8"
+			}
 		case "40M":
 			if freqInt >= 7000 && freqInt < 7045.5 {
 				spot.Mode = "CW"
@ -310,6 +346,22 @@ func (spot *TelnetSpot) GuessMode() {
 			if freqInt >= 29000 && freqInt <= 29700 {
 				spot.Mode = "FM"
 			}
+		case "6M":
+			if freqInt >= 50000 && freqInt < 50100 {
+				spot.Mode = "CW"
+			}
+			if freqInt >= 50100 && freqInt < 50313 {
+				spot.Mode = "USB"
+			}
+			if freqInt >= 50313 && freqInt < 50320 {
+				spot.Mode = "FT8"
+			}
+			if freqInt >= 50320 && freqInt < 50400 {
+				spot.Mode = "USB"
+			}
+			if freqInt >= 50400 && freqInt < +52000 {
+				spot.Mode = "FM"
+			}
 		}
 	}

--- a/templates/home.html
+++ b/templates/home.html
@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="theme-color" content="#18181B">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-    <script src="https://unpkg.com/htmx.org@1.9.5" integrity="sha384-xcuj3WpfgjlKF+FXhSQFQ0ZNr39ln+hwjN3npfM9VBnUskLolQAcN80McRIVOPuO" crossorigin="anonymous"></script>
-    <script src="https://cdn.tailwindcss.com"></script>
-    <title>FlexDXCluster DashBoard</title>
-    <style>
-   .card-deck {
-        display: flex;
-        flex-wrap: wrap;
-        align-content: space-between;
-    }
-
-    .main {
-        display: flex;
-        width: 100%;
-    }
-
-    .menu {
-        display: flex;
-        width: 10%;
-    }
-
-    .left {
-        display: flex;
-        height: 600px;
-        width: 25%;
-        flex-direction: column;
-        margin-top: 50px;
-    }
-    .right {
-        display: flex;
-        height: 400px;
-        width: 20%;
-        justify-content: right;
-        margin-top: 50px;
-    }
-
-    .container {
-        margin-top: 50px;
-    }
-
-    body {
-        background-image: url('./images/background.jpg');
-    }
-    </style>
-</head>
-<body>
-    <br>
-    <!-- <div class="absolute top-0 z-[-2] h-screen w-screen bg-[#000000] bg-[radial-gradient(#ffffff33_1px,#00091d_1px)] bg-[size:20px_20px]"></div>
-    <h1 class="text-center text-white text-2xl font-bold">Flex DX Cluster Dashboard</h1>
-    <img class="rounded-full w-36 h-36 mx-auto" src="./images/logo.png">
-    
-    <br>
-    <br>      
-    -->
- 
-
-    <div class="main">
-        <!-- sidebar -->
-        <div class="hidden md:flex flex-col w-64 h-800">
-            <div class="flex items-center justify-center h-16">
-                <span class="text-white font-bold uppercase">Flex DX Cluster</span>
-            </div>
-            <div class="flex flex-col flex-1 overflow-y-auto">
-                <nav class="flex-1 px-2 py-4">
-                    <a href="#" class="flex items-center px-4 py-2 text-gray-100 hover:bg-gray-700">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mr-2" fill="none" viewBox="0 0 24 24"
-                            stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                d="M4 6h16M4 12h16M4 18h16" />
-                        </svg>
-                        Dashboard
-                    </a>
-                    <a href="#" class="flex items-center px-4 py-2 mt-2 text-gray-100 hover:bg-gray-700">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mr-2" fill="none" viewBox="0 0 24 24"
-                            stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                d="M6 18L18 6M6 6l12 12" />
-                        </svg>
-                        Messages
-                    </a>
-                    <a href="#" class="flex items-center px-4 py-2 mt-2 text-gray-100 hover:bg-gray-700">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mr-2" fill="none" viewBox="0 0 24 24"
-                            stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                d="M13 10V3L4 14h7v7l9-11h-7z" />
-                        </svg>
-                        Settings
-                    </a>
-                </nav>
-            </div>
-        </div>
-
-        <div class="left">
-            <div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 ml-4 mr-2" style="margin-bottom: 2em; height: 12rem;">
-                <h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">Spots</h5>
-                <h6 class="card-subtitle mb-2 text-muted">Current number of spots</h6>
-                <br>
-                <div class="font-bold text-gray-700 text-center text-4xl text-red-800" id="spotCount" hx-get="/spotscount" hx-trigger="every 1s" hx-swap="innerHTML"></div>
-            </div>
-
-            <div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 ml-4 mr-2" style="height: 17rem;">
-                <h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">Top Spotters</h5>
-                <div class="font-normal text-gray-700 dark:text-gray-400" id="spotters" hx-get="/spotters" hx-trigger="every 1s" hx-swap="innerHTML"></div>
-            </div>
-
-        </div>
-
-        <div class="container w-full mx-auto">
-            <div class="flex-container"  id="spot" hx-get="/spots" hx-trigger="every 1s" hx-swap="innerHTML"></div>
-        </div>
-
-        <div class="right">
-            <div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 mr-4" style= "height: 18; width: 23rem;">
-                <h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">To Work</h5>
-                    <h6 class="card-subtitle mb-2 text-muted">New DXCC, Band or Mode</h6>
-                    <div class="card-text" id="new" hx-get="/new" hx-trigger="every 1s" hx-swap="innerHTML"></div>
-            </div>
-        </div>
-    </div>
-
-</body>
-</html>
--- a/templates/new.html
+++ b/templates/new.html
@ -1,9 +0,0 @@
-{{ define "new" }}
-
-{{ range.}}
-
-{{ if .NewDXCC }}<span class="fw-bold text-green-600/100"> {{ else if .NewMode }}<span class="fw-bold text-orange-600/100"> {{ else }}<span class="fw-bold"> {{ end }} {{ .DX }}</span>	&rarr; <span>{{ .Status }}</span><br>
-
-{{ end }}
-
-{{ end }}
--- a/templates/spot.html
+++ b/templates/spot.html
@ -1,28 +0,0 @@
-{{define "spot"}}
-<table class="table-auto rounded-tl-sm w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-    <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
-    <tr>
-        <th scope="col" class="px-6 py-3">DX</th>
-        <th scope="col" class="px-6 py-3">Spotter</th>
-        <th scope="col" class="px-6 py-3">Freq</th>
-        <th scope="col" class="px-6 py-3">Band</th>
-        <th scope="col" class="px-6 py-3">Mode</th>
-        <th scope="col" class="px-6 py-3">UTC Time</th>
-        <th scope="col" class="px-6 py-3">Comment</th>
-    </tr>
-    </thead>
-    <tbody>
-        {{ range .}}
-        <tr class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700 h-2">
-        {{ if .NewDXCC }} <th scope="row" class="px-1 py-1 font-medium text-green-900 whitespace-nowrap dark:text-white"> {{ else if .NewMode }}<th scope="row" class="px-1 py-1 font-medium text-red-900 whitespace-nowrap dark:text-white"> {{ else }} <th scope="row" class="px-1 py-1 font-medium text-gray-900 whitespace-nowrap dark:text-white">{{ end }} {{ .DX }}</th>
-        <td class="text-center px-1 py-1">{{ .SpotterCallsign }}</td>
-        <td class="text-center px-1 py-1">{{ .FrequencyHz }}</td>
-        <td class="text-center px-1 py-1">{{ .Band }}</td>
-        <td class="text-center px-1 py-1">{{ .Mode }}</td>
-        <td class="text-center px-1 py-1">{{ .UTCTime }}</td>
-        <td class="text-center px-1 py-1">{{ .Comment }}</td>
-    </tr>
-    {{ end }}
-    </tbody>
-</table>
-{{end}}
--- a/templates/spotCount.html
+++ b/templates/spotCount.html
@ -1,5 +0,0 @@
-{{ define "spotCount" }}
-
-{{ . }}
-
-{{ end }}
--- a/templates/spotters.html
+++ b/templates/spotters.html
@ -1,9 +0,0 @@
-{{ define "spotters" }}
-
-{{ range.}}
-
-<span class="fw-bold">{{ .Spotter }}</span>: <span>{{ .NumberofSpots }} spots</span><br>
-
-{{ end }}
-
-{{ end }}
--- a/utils.go
+++ b/utils.go
@ -2,7 +2,10 @@ package main

 import (
 	"log"
+	"os"
+	"os/signal"
 	"strconv"
+	"syscall"
 )

 func FreqMhztoHz(freq string) string {
@ -26,3 +29,30 @@ func FreqHztoMhz(freq string) string {

 	return strconv.FormatFloat(frequency, 'f', 6, 64)
 }
+
+func CheckSignal(TCPClient *TCPClient, TCPServer *TCPServer, FlexClient *FlexClient, fRepo *FlexDXClusterRepository, cRepo *Log4OMContactsRepository) {
+
+	sigCh := make(chan os.Signal, 1)
+	signal.Notify(sigCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
+
+	// Gracely closing all connextions if signal is received
+	for sig := range sigCh {
+		Log.Infof("received signal: %v, shutting down all connections.", sig)
+
+		TCPClient.Close()
+		TCPServer.Conn.Close()
+		FlexClient.Conn.Close()
+
+		if err := fRepo.db.Close(); err != nil {
+			Log.Error("failed to close the database connection properly")
+			os.Exit(1)
+		}
+
+		if err := cRepo.db.Close(); err != nil {
+			Log.Error("failed to close Log4OM database connection properly")
+			os.Exit(1)
+		}
+
+		os.Exit(0)
+	}
+}
--- a/xml.go
+++ b/xml.go
@ -5,6 +5,8 @@ import (
 	"io"
 	"os"
 	"regexp"
+	"strings"
+	"unicode/utf8"
 )

 type Countries struct {
@ -43,15 +45,24 @@ type CountryPrefix struct {
 	EndDate    string   `xml:"EndDate"`
 }

+type DXCC struct {
+	Callsign        string
+	CountryName     string
+	DXCC            string
+	RegEx           string
+	RegExSplit      []string
+	RegExCharacters int
+	Ended           bool
+}
+
 func LoadCountryFile() Countries {
 	// Open our xmlFile
 	xmlFile, err := os.Open("country.xml")
 	// if we os.Open returns an error then handle it
 	if err != nil {
-		Log.Errorln(err)
+		os.Exit(1)
 	}

-	Log.Infoln("Successfully loaded country.xml")
 	// defer the closing of our xmlFile so that we can parse it later on
 	defer xmlFile.Close()

@ -65,14 +76,64 @@ func LoadCountryFile() Countries {
 }

 func GetDXCC(dxCall string, Countries Countries) string {
+	DXCCList := []DXCC{}
+	d := DXCC{}
+
+	// Get all the matching DXCC for current callsign
 	for i := 0; i < len(Countries.Countries); i++ {
-		// for j := 0; j < len(Countries.Countries[i].CountryPrefixList.CountryPrefixList); j++ {
 		regExp := regexp.MustCompile(Countries.Countries[i].CountryPrefixList.CountryPrefixList[len(Countries.Countries[i].CountryPrefixList.CountryPrefixList)-1].PrefixList)
+
 		match := regExp.FindStringSubmatch(dxCall)
 		if len(match) != 0 {
-			return Countries.Countries[i].Dxcc
+
+			d = DXCC{
+				Callsign:    dxCall,
+				CountryName: Countries.Countries[i].CountryName,
+				DXCC:        Countries.Countries[i].Dxcc,
+				RegEx:       Countries.Countries[i].CountryPrefixList.CountryPrefixList[len(Countries.Countries[i].CountryPrefixList.CountryPrefixList)-1].PrefixList,
+			}
+
+			if Countries.Countries[i].CountryPrefixList.CountryPrefixList[len(Countries.Countries[i].CountryPrefixList.CountryPrefixList)-1].EndDate == "" {
+				d.Ended = false
+			} else {
+				d.Ended = true
+			}
+
+			DXCCList = append(DXCCList, d)
 		}
-		// }
 	}
+
+	for i := 0; i < len(DXCCList); i++ {
+		DXCCList[i].RegExSplit = strings.Split(DXCCList[i].RegEx, "|")
+
+		for j := 0; j < len(DXCCList[i].RegExSplit); j++ {
+			regExp := regexp.MustCompile(DXCCList[i].RegExSplit[j])
+			matched := regExp.FindStringSubmatch(dxCall)
+			if len(matched) > 0 {
+				DXCCList[i].RegExCharacters = utf8.RuneCountInString(DXCCList[i].RegExSplit[j])
+			}
+		}
+	}
+
+	if len(DXCCList) > 0 {
+		DXCCMatch := DXCCList[0]
+		higherMatch := 0
+
+		if len(DXCCList) > 1 {
+			for i := 0; i < len(DXCCList); i++ {
+				if DXCCList[i].RegExCharacters > higherMatch && !DXCCList[i].Ended {
+					DXCCMatch = DXCCList[i]
+					higherMatch = DXCCList[i].RegExCharacters
+				}
+			}
+		} else {
+			DXCCMatch = DXCCList[0]
+		}
+
+		return DXCCMatch.DXCC
+	} else {
+		Log.Errorf("Could not find %s in country list", dxCall)
+	}
+
 	return ""
 }
Author	SHA1	Message	Date
Greg	71c57cb2a1	up	2024-11-30 21:49:00 +07:00
Greg	eaa0c62892	correct band guess	2024-11-16 23:03:12 +07:00
Greg	50c86e82d7	remove HTTP server	2024-11-16 12:24:42 +07:00
Greg	1f83105c8c	up	2024-11-15 20:41:34 +07:00
Greg	e99a0a921d	up	2024-11-13 09:19:43 +07:00
Greg	10f936838f	better match dxcc	2024-11-06 15:07:36 +07:00
Greg	861a5ff14b	update	2024-10-31 15:57:53 +07:00
Greg	c86f531313	remove clublog	2024-10-31 15:28:54 +07:00
Greg	ff43b9c150	adding icon	2024-10-31 13:21:24 +07:00
Greg	f571d8ea18	update log	2024-10-31 11:14:35 +07:00
Greg	91fc5836eb	discovery	2024-10-30 22:46:48 +07:00
Greg	8b3658b5af	adding discovery	2024-10-30 22:40:25 +07:00
Greg	4454822ad4	update	2024-10-29 18:41:08 +07:00
Greg	868108cd84	Merge branch 'goroutinesDb'	2024-10-24 22:59:10 +07:00
Gregory Salaun	8b2a0e003c	up	2024-10-24 22:04:58 +07:00
Gregory Salaun	cf6a5bf016	update xml	2024-10-24 22:00:35 +07:00