diff --git a/Makefile b/Makefile deleted file mode 100644 index 1b9fa00..0000000 --- a/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - go build . \ No newline at end of file diff --git a/flexradio.go b/flexradio.go index cb52a85..7335e4f 100644 --- a/flexradio.go +++ b/flexradio.go @@ -202,9 +202,10 @@ func (fc *FlexClient) SendSpottoFlex(spot TelnetSpot) { flexSpot.BackgroundColor = "#ff000000" flexSpot.Comment = flexSpot.Comment + " [New Band]" } else if !spot.NewBand && !spot.NewMode && !spot.NewDXCC && !spot.CallsignWorked && spot.NewSlot { - flexSpot.Color = "#ffeaeaa0" + flexSpot.Color = "#ff91d2ff" flexSpot.Priority = "5" flexSpot.BackgroundColor = "#ff000000" + flexSpot.Comment = flexSpot.Comment + " [New Slot]" } else if !spot.NewBand && !spot.NewMode && !spot.NewDXCC && !spot.CallsignWorked { flexSpot.Color = "#ffeaeaea" flexSpot.Priority = "5" diff --git a/images/FlexDXCluster.ico b/images/FlexDXCluster.ico deleted file mode 100644 index 61ee39e..0000000 Binary files a/images/FlexDXCluster.ico and /dev/null differ diff --git a/images/background.jpg b/images/background.jpg deleted file mode 100644 index 2eee2ce..0000000 Binary files a/images/background.jpg and /dev/null differ diff --git a/main.go b/main.go index 3d31420..fa882b6 100644 --- a/main.go +++ b/main.go @@ -42,7 +42,7 @@ func main() { cfg := NewConfig(cfgPath) log := NewLog() - log.Info("Running FlexDXCluster version 0.4") + log.Info("Running FlexDXCluster version 0.5") log.Infof("Callsign: %s", cfg.SQLite.Callsign) DeleteDatabase("./flex.sqlite", log) diff --git a/spot.go b/spot.go index 720aefc..fef8060 100644 --- a/spot.go +++ b/spot.go @@ -65,7 +65,7 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te contactsCallChan := make(chan []Contact) wg := new(sync.WaitGroup) - wg.Add(4) + wg.Add(5) go contactRepo.ListByCountry(spot.DXCC, contactsChan, wg) contacts := <-contactsChan @@ -79,8 +79,8 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te go contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode, contactsCallChan, wg) contactsCall := <-contactsCallChan - go contactRepo.ListByCountryModeBand(spot.DX, spot.Band, spot.Mode, contactsModeBandChan, wg) - contactsModeBand := <-contactsCallChan + go contactRepo.ListByCountryModeBand(spot.DXCC, spot.Band, spot.Mode, contactsModeBandChan, wg) + contactsModeBand := <-contactsModeBandChan wg.Wait() @@ -126,7 +126,7 @@ 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) } - if !spot.NewDXCC && spot.NewSlot && spot.Mode != "" { + if !spot.NewDXCC && !spot.NewBand && !spot.NewMode && spot.NewSlot && spot.Mode != "" { Log.Debugf("(** New Slot **) 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) }