rouggy/FlexDXCluster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upd

Browse Source
This commit is contained in:
Gregory Salaun 2024-10-22 00:32:59 +07:00
parent ecedb0ea5d
commit 83816777b7
7 changed files with 363 additions and 841 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
FlexDXCluster.exe
View File

Binary file not shown.

10
TCPClient.go
View File

@ -11,7 +11,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
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 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 var count int = 0
type TCPClient struct { type TCPClient struct {
@ -150,10 +150,10 @@ func (c *TCPClient) ReadLine() {
c.Log.Info("start receiving spots") c.Log.Info("start receiving spots")
} }
start := time.Now() // start := time.Now()
ProcessTelnetSpot(spotRe, message, c.SpotChan, c.Log, c.Countries) ProcessTelnetSpot(spotRe, message, c.SpotChan, c.Countries)
elapsed := time.Since(start) // elapsed := time.Since(start)
Log.Infof("Total time for processing spot: %s", elapsed) // Log.Infof("Total time for processing spot: %s", elapsed)
// Send the spot message to TCP server // Send the spot message to TCP server
if len(c.TCPServer.Clients) > 0 { if len(c.TCPServer.Clients) > 0 {

15
database.go
View File

@ -35,24 +35,29 @@ type FlexDXClusterRepository struct {
Log *log.Logger Log *log.Logger
} }
func NewLog4OMContactsRepository(filePath string, log *log.Logger) *Log4OMContactsRepository { func NewLog4OMContactsRepository(filePath string) *Log4OMContactsRepository {
db, err := sql.Open("sqlite3", filePath) db, err := sql.Open("sqlite3", filePath)
if err != nil { if err != nil {
fmt.Println("Cannot open db", err) fmt.Println("Cannot open db", err)
} }
_, err = db.Exec("PRAGMA journal_mode=WAL")
if err != nil {
panic(err)
}
return &Log4OMContactsRepository{ return &Log4OMContactsRepository{
db: db, db: db,
Log: log} Log: Log}
} }
func NewFlexDXDatabase(filePath string, log *log.Logger) *FlexDXClusterRepository { func NewFlexDXDatabase(filePath string) *FlexDXClusterRepository {
db, err := sql.Open("sqlite3", filePath) db, err := sql.Open("sqlite3", filePath)
if err != nil { if err != nil {
fmt.Println("Cannot open db", err) fmt.Println("Cannot open db", err)
} }
log.Info("Opening SQLite database") Log.Info("Opening SQLite database")
_, err = db.ExecContext( _, err = db.ExecContext(
context.Background(), context.Background(),
@ -85,7 +90,7 @@ func NewFlexDXDatabase(filePath string, log *log.Logger) *FlexDXClusterRepositor
return &FlexDXClusterRepository{ return &FlexDXClusterRepository{
db: db, db: db,
Log: log, Log: Log,
} }
} }

BIN
flex.sqlite
View File

Binary file not shown.

1146
flexradio.log
View File

File diff suppressed because it is too large Load Diff

4
main.go
View File

@ -60,10 +60,10 @@ func main() {
// Load country.xml to get all the DXCC // Load country.xml to get all the DXCC
Countries := LoadCountryFile() Countries := LoadCountryFile()
fRepo := NewFlexDXDatabase("flex.sqlite", log) fRepo := NewFlexDXDatabase("flex.sqlite")
defer fRepo.db.Close() defer fRepo.db.Close()
cRepo := NewLog4OMContactsRepository(cfg.SQLite.SQLitePath, log) cRepo := NewLog4OMContactsRepository(cfg.SQLite.SQLitePath)
defer cRepo.db.Close() defer cRepo.db.Close()
TCPServer := NewTCPServer(cfg.TelnetServer.Host, cfg.TelnetServer.Port, log) TCPServer := NewTCPServer(cfg.TelnetServer.Host, cfg.TelnetServer.Port, log)

29
spot.go
View File

@ -4,10 +4,8 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"time"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
log "github.com/sirupsen/logrus"
) )
type TelnetSpot struct { type TelnetSpot struct {
@ -27,7 +25,7 @@ type TelnetSpot struct {
CallsignWorked bool CallsignWorked bool
} }
func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChan chan TelnetSpot, log *log.Logger, Countries Countries) { func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChan chan TelnetSpot, Countries Countries) {
match := re.FindStringSubmatch(spotRaw) match := re.FindStringSubmatch(spotRaw)
if len(match) != 0 { if len(match) != 0 {
@ -40,30 +38,21 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChan chan TelnetSp
Time: match[6], Time: match[6],
} }
start := time.Now()
spot.DXCC = GetDXCC(spot.DX, Countries) spot.DXCC = GetDXCC(spot.DX, Countries)
elapsed := time.Since(start)
Log.Infof("Loop for DXCC: %s", elapsed)
spot.GetBand() spot.GetBand()
spot.GuessMode() spot.GuessMode()
spot.CallsignWorked = false spot.CallsignWorked = false
spot.NewBand = false spot.NewBand = false
spot.NewMode = false spot.NewMode = false
spot.NewDXCC = false spot.NewDXCC = false
contactRepo := NewLog4OMContactsRepository(Cfg.SQLite.SQLitePath, log) contactRepo := NewLog4OMContactsRepository(Cfg.SQLite.SQLitePath)
defer contactRepo.db.Close() defer contactRepo.db.Close()
start = time.Now()
contacts, _ := contactRepo.ListByCountry(spot.DXCC) contacts, _ := contactRepo.ListByCountry(spot.DXCC)
contactsMode, _ := contactRepo.ListByCountryMode(spot.DXCC, spot.Mode) contactsMode, _ := contactRepo.ListByCountryMode(spot.DXCC, spot.Mode)
contactsBand, _ := contactRepo.ListByCountryBand(spot.DXCC, spot.Band) contactsBand, _ := contactRepo.ListByCountryBand(spot.DXCC, spot.Band)
contactsCall, _ := contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode) contactsCall, _ := contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode)
elapsed = time.Since(start)
Log.Infof("Elapsed db checking %s", elapsed)
if len(contacts) == 0 { if len(contacts) == 0 {
switch spot.DXCC { switch spot.DXCC {
@ -86,34 +75,36 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChan chan TelnetSp
SpotChan <- spot SpotChan <- spot
if spot.NewDXCC { 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", 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) spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.CommandNumber, spot.FlexSpotNumber)
} }
if !spot.NewDXCC && spot.NewBand && spot.NewMode { if !spot.NewDXCC && spot.NewBand && spot.NewMode {
log.Debugf("(** New Band/Mode **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - DXCC: %s", Log.Debugf("(** New Band/Mode **) 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) spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC)
} }
if !spot.NewDXCC && spot.NewBand && !spot.NewMode { if !spot.NewDXCC && spot.NewBand && !spot.NewMode {
log.Debugf("(** New Band **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - DXCC: %s", Log.Debugf("(** New Band **) 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) spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC)
} }
if !spot.NewDXCC && !spot.NewBand && spot.NewMode && spot.Mode != "" { if !spot.NewDXCC && !spot.NewBand && spot.NewMode && spot.Mode != "" {
log.Debugf("(** New Mode **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - DXCC: %s", Log.Debugf("(** New Mode **) 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) spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC)
} }
if !spot.NewDXCC && !spot.NewBand && !spot.NewMode && spot.CallsignWorked { if !spot.NewDXCC && !spot.NewBand && !spot.NewMode && spot.CallsignWorked {
log.Debugf("(** Worked **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - DXCC: %s", Log.Debugf("(** Worked **) 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) spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC)
} }
if !spot.NewDXCC && !spot.NewBand && !spot.NewMode { if !spot.NewDXCC && !spot.NewBand && !spot.NewMode {
log.Debugf("DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - DXCC: %s", Log.Debugf("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) spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC)
} }
} else {
Log.Infof("Could not decode: %s", strings.Trim(spotRaw, "\n"))
} }
} }