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

Merge branch 'goroutinesDb'

Browse Source
This commit is contained in:
Gregory Salaun 2024-10-24 22:59:10 +07:00
commit 868108cd84
3 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
database.go
View File

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
"sync"
"time" "time"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@ -94,114 +95,112 @@ func NewFlexDXDatabase(filePath string) *FlexDXClusterRepository {
} }
} }
func (r *Log4OMContactsRepository) ListByCountry(countryID string) ([]*Contact, error) { func (r *Log4OMContactsRepository) ListByCountry(countryID string, contactsChan chan []Contact, wg *sync.WaitGroup) {
defer wg.Done()
rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ?", countryID) rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ?", countryID)
if err != nil { if err != nil {
log.Error("could not query database", err) log.Error("could not query database", err)
return nil, err
} }
defer rows.Close() defer rows.Close()
contacts := []*Contact{} contacts := []Contact{}
for rows.Next() { for rows.Next() {
c := Contact{} c := Contact{}
if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
log.Error("could not query database", err) log.Error("could not query database", err)
return nil, err
} }
contacts = append(contacts, &c) contacts = append(contacts, c)
} }
return contacts, nil contactsChan <- contacts
} }
func (r *Log4OMContactsRepository) ListByCountryMode(countryID string, mode string) ([]*Contact, error) { func (r *Log4OMContactsRepository) ListByCountryMode(countryID string, mode string, contactsModeChan chan []Contact, wg *sync.WaitGroup) {
defer wg.Done()
if mode == "USB" || mode == "LSB" { if mode == "USB" || mode == "LSB" {
rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND (mode = ? OR mode = ?)", countryID, "USB", "LSB") rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND (mode = ? OR mode = ?)", countryID, "USB", "LSB")
if err != nil { if err != nil {
log.Error("could not query database", err) log.Error("could not query database", err)
return nil, err
} }
defer rows.Close() defer rows.Close()
contacts := []*Contact{} contacts := []Contact{}
for rows.Next() { for rows.Next() {
c := Contact{} c := Contact{}
if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
log.Error("could not query database", err) log.Error("could not query database", err)
return nil, err
} }
contacts = append(contacts, &c) contacts = append(contacts, c)
} }
return contacts, nil contactsModeChan <- contacts
} else { } else {
rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND mode = ?", countryID, mode) rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND mode = ?", countryID, mode)
if err != nil { if err != nil {
log.Error("could not query the database", err) log.Error("could not query the database", err)
return nil, err
} }
defer rows.Close() defer rows.Close()
contacts := []*Contact{} contacts := []Contact{}
for rows.Next() { for rows.Next() {
c := Contact{} c := Contact{}
if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
fmt.Println(err) fmt.Println(err)
return nil, err
} }
contacts = append(contacts, &c) contacts = append(contacts, c)
} }
return contacts, nil contactsModeChan <- contacts
} }
} }
func (r *Log4OMContactsRepository) ListByCountryBand(countryID string, band string) ([]*Contact, error) { func (r *Log4OMContactsRepository) ListByCountryBand(countryID string, band string, contactsBandChan chan []Contact, wg *sync.WaitGroup) {
defer wg.Done()
rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND band = ?", countryID, band) rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND band = ?", countryID, band)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return nil, err
} }
defer rows.Close() defer rows.Close()
contacts := []*Contact{} contacts := []Contact{}
for rows.Next() { for rows.Next() {
c := Contact{} c := Contact{}
if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
fmt.Println(err) fmt.Println(err)
return nil, err
} }
contacts = append(contacts, &c) contacts = append(contacts, c)
} }
return contacts, nil contactsBandChan <- contacts
} }
func (r *Log4OMContactsRepository) ListByCallSign(callSign string, band string, mode string) ([]*Contact, error) { func (r *Log4OMContactsRepository) ListByCallSign(callSign string, band string, mode string, contactsCallChan chan []Contact, wg *sync.WaitGroup) {
defer wg.Done()
rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE callsign = ? AND band = ? AND mode = ?", callSign, band, mode) rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE callsign = ? AND band = ? AND mode = ?", callSign, band, mode)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return nil, err
} }
defer rows.Close() defer rows.Close()
contacts := []*Contact{} contacts := []Contact{}
for rows.Next() { for rows.Next() {
c := Contact{} c := Contact{}
if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
fmt.Println(err) fmt.Println(err)
return nil, err
} }
contacts = append(contacts, &c) contacts = append(contacts, c)
} }
return contacts, nil contactsCallChan <- contacts
} }
func (r *FlexDXClusterRepository) GetAllSpots(limit string) []FlexSpot { func (r *FlexDXClusterRepository) GetAllSpots(limit string) []FlexSpot {

39
spot.go
View File

@ -4,7 +4,7 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"time" "sync"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
@ -50,23 +50,30 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te
contactRepo := NewLog4OMContactsRepository(Cfg.SQLite.SQLitePath) contactRepo := NewLog4OMContactsRepository(Cfg.SQLite.SQLitePath)
defer contactRepo.db.Close() defer contactRepo.db.Close()
start := time.Now() contactsChan := make(chan []Contact)
contacts, _ := contactRepo.ListByCountry(spot.DXCC) contactsModeChan := make(chan []Contact)
contactsMode, _ := contactRepo.ListByCountryMode(spot.DXCC, spot.Mode) contactsBandChan := make(chan []Contact)
contactsBand, _ := contactRepo.ListByCountryBand(spot.DXCC, spot.Band) contactsCallChan := make(chan []Contact)
contactsCall, _ := contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode)
elapsed := time.Since(start) wg := new(sync.WaitGroup)
Log.Infof("Checking Db took: %s", elapsed) wg.Add(4)
go contactRepo.ListByCountry(spot.DXCC, contactsChan, wg)
contacts := <-contactsChan
go contactRepo.ListByCountryMode(spot.DXCC, spot.Mode, contactsModeChan, wg)
contactsMode := <-contactsModeChan
go contactRepo.ListByCountryBand(spot.DXCC, spot.Band, contactsBandChan, wg)
contactsBand := <-contactsBandChan
go contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode, contactsCallChan, wg)
contactsCall := <-contactsCallChan
wg.Wait()
if len(contacts) == 0 { if len(contacts) == 0 {
switch spot.DXCC { spot.NewDXCC = true
case "997":
spot.NewDXCC = false
case "1000":
spot.NewDXCC = false
default:
spot.NewDXCC = true
}
} }
if len(contactsMode) == 0 { if len(contactsMode) == 0 {

2
xml.go
View File

@ -66,11 +66,13 @@ func LoadCountryFile() Countries {
func GetDXCC(dxCall string, Countries Countries) string { func GetDXCC(dxCall string, Countries Countries) string {
for i := 0; i < len(Countries.Countries); i++ { 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) regExp := regexp.MustCompile(Countries.Countries[i].CountryPrefixList.CountryPrefixList[len(Countries.Countries[i].CountryPrefixList.CountryPrefixList)-1].PrefixList)
match := regExp.FindStringSubmatch(dxCall) match := regExp.FindStringSubmatch(dxCall)
if len(match) != 0 { if len(match) != 0 {
return Countries.Countries[i].Dxcc return Countries.Countries[i].Dxcc
} }
// }
} }
return "" return ""
} }