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

up

Browse Source
This commit is contained in:
Gregory Salaun
2025-10-21 19:27:58 +02:00
parent 77e0343330
commit d77fcd8ef5
6 changed files with 196 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TCPClient.go
View File

@@ -15,7 +15,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
var spotRe *regexp.Regexp = regexp.MustCompile(`(?i)DX\sde\s([\w\d\-#]+).*?:\s*(\d+\.\d+)\s+([\w\d\/]+)\s+(?:(CW|SSB|FT8|FT4|RTTY|USB|LSB|FM)\s+)?(.+?)\s+(\d{4}Z)`) var spotRe *regexp.Regexp = regexp.MustCompile(`(?i)DX\sde\s([\w\d\/]+?)(?:-[#\d-]+)?\s*:\s*(\d+\.\d+)\s+([\w\d\/]+)\s+(?:(CW|SSB|FT8|FT4|RTTY|USB|LSB|FM)\s+)?(.+?)\s+(\d{4}Z)`)
var defaultLoginRe *regexp.Regexp = regexp.MustCompile("[\\w\\d-_]+ login:") var defaultLoginRe *regexp.Regexp = regexp.MustCompile("[\\w\\d-_]+ login:")
var defaultPasswordRe *regexp.Regexp = regexp.MustCompile("Password:") var defaultPasswordRe *regexp.Regexp = regexp.MustCompile("Password:")

3
httpserver.go
View File

@@ -773,6 +773,7 @@ func (s *HTTPServer) getWatchlistSpotsWithStatus(w http.ResponseWriter, r *http.
for _, pattern := range watchlistCallsigns { for _, pattern := range watchlistCallsigns {
if spot.DX == pattern || strings.HasPrefix(spot.DX, pattern) { if spot.DX == pattern || strings.HasPrefix(spot.DX, pattern) {
isInWatchlist = true isInWatchlist = true
Log.Debugf("✅ Watchlist match in API: %s matches pattern %s", spot.DX, pattern)
break break
} }
} }
@@ -782,6 +783,8 @@ func (s *HTTPServer) getWatchlistSpotsWithStatus(w http.ResponseWriter, r *http.
} }
} }
Log.Debugf("📊 Watchlist spots API returned %d spots", len(relevantSpots))
type BandModeKey struct { type BandModeKey struct {
Band string Band string
Mode string Mode string

2
spot.go
View File

@@ -321,6 +321,8 @@ func (spot *TelnetSpot) GuessMode(rawSpot string) {
spot.Mode = "FT8" spot.Mode = "FT8"
} else if freqInt < 14083 { } else if freqInt < 14083 {
spot.Mode = "FT4" spot.Mode = "FT4"
} else if freqInt < 14095 {
spot.Mode = "FT8"
} else if freqInt < 14112 { } else if freqInt < 14112 {
spot.Mode = "RTTY" spot.Mode = "RTTY"
} else { } else {

1
spotprocessor.go
View File

@@ -84,7 +84,6 @@ func (sp *SpotProcessor) processSpot(spot TelnetSpot) {
if sp.HTTPServer != nil && sp.HTTPServer.Watchlist != nil { if sp.HTTPServer != nil && sp.HTTPServer.Watchlist != nil {
if sp.HTTPServer.Watchlist.Matches(flexSpot.DX) { if sp.HTTPServer.Watchlist.Matches(flexSpot.DX) {
flexSpot.InWatchlist = true flexSpot.InWatchlist = true
flexSpot.Comment = flexSpot.Comment + " [Watchlist]"
// Mark as seen and update last seen time // Mark as seen and update last seen time
sp.HTTPServer.Watchlist.MarkSeen(flexSpot.DX) sp.HTTPServer.Watchlist.MarkSeen(flexSpot.DX)

3
watchlist.go
View File

@@ -10,8 +10,7 @@ import (
) )
type WatchlistEntry struct { type WatchlistEntry struct {
Callsign string `json:"callsign"` Callsign string `json:"callsign"`
// ✅ NOTES SUPPRIMÉES
LastSeen time.Time `json:"lastSeen"` LastSeen time.Time `json:"lastSeen"`
LastSeenStr string `json:"lastSeenStr"` LastSeenStr string `json:"lastSeenStr"`
AddedAt time.Time `json:"addedAt"` AddedAt time.Time `json:"addedAt"`

362
watchlist.json
View File

@@ -1,12 +1,60 @@
[ [
{ {
"callsign": "9L9L", "callsign": "PY0FB",
"lastSeen": "0001-01-01T00:00:00Z", "lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never", "lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:53.3401773+02:00", "addedAt": "2025-10-18T17:17:24.3843986+02:00",
"spotCount": 0, "spotCount": 0,
"playSound": true "playSound": true
}, },
{
"callsign": "5H3MB",
"lastSeen": "2025-10-20T22:27:00.0920217+02:00",
"lastSeenStr": "20 hours ago",
"addedAt": "2025-10-18T17:18:42.8402097+02:00",
"spotCount": 6,
"playSound": true
},
{
"callsign": "C5R",
"lastSeen": "2025-10-21T19:27:01.1572273+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:18:04.5006892+02:00",
"spotCount": 219,
"playSound": true
},
{
"callsign": "SU0ERA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:45.8848244+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "XT2AW",
"lastSeen": "2025-10-21T04:49:21.3973928+02:00",
"lastSeenStr": "14 hours ago",
"addedAt": "2025-10-18T17:17:27.3839089+02:00",
"spotCount": 69,
"playSound": true
},
{
"callsign": "3B8M",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:32.6851135+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "5K0UA",
"lastSeen": "2025-10-21T19:26:43.7522993+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:17:53.7390559+02:00",
"spotCount": 437,
"playSound": true
},
{ {
"callsign": "9L8MD", "callsign": "9L8MD",
"lastSeen": "0001-01-01T00:00:00Z", "lastSeen": "0001-01-01T00:00:00Z",
@@ -16,11 +64,11 @@
"playSound": true "playSound": true
}, },
{ {
"callsign": "PJ6Y", "callsign": "E6AD",
"lastSeen": "2025-10-19T18:26:10.9139291+02:00", "lastSeen": "2025-10-20T20:08:38.1641735+02:00",
"lastSeenStr": "Just now", "lastSeenStr": "23 hours ago",
"addedAt": "2025-10-18T17:17:47.7237081+02:00", "addedAt": "2025-10-18T17:17:40.8765179+02:00",
"spotCount": 319, "spotCount": 459,
"playSound": true "playSound": true
}, },
{ {
@@ -32,19 +80,19 @@
"playSound": true "playSound": true
}, },
{ {
"callsign": "XT2AW", "callsign": "4X6TT",
"lastSeen": "2025-10-19T17:43:24.3788757+02:00", "lastSeen": "2025-10-19T19:59:28.3446792+02:00",
"lastSeenStr": "Just now", "lastSeenStr": "1 day ago",
"addedAt": "2025-10-18T17:17:27.3839089+02:00", "addedAt": "2025-10-18T17:18:13.335878+02:00",
"spotCount": 22, "spotCount": 1,
"playSound": true "playSound": true
}, },
{ {
"callsign": "PY0FB", "callsign": "PJ6Y",
"lastSeen": "0001-01-01T00:00:00Z", "lastSeen": "2025-10-21T19:25:29.1180452+02:00",
"lastSeenStr": "Never", "lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:17:24.3843986+02:00", "addedAt": "2025-10-18T17:17:47.7237081+02:00",
"spotCount": 0, "spotCount": 664,
"playSound": true "playSound": true
}, },
{ {
@@ -56,29 +104,13 @@
"playSound": true "playSound": true
}, },
{ {
"callsign": "EL2BG", "callsign": "9L9L",
"lastSeen": "2025-10-19T18:20:24.2625789+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:18:10.2000017+02:00",
"spotCount": 19,
"playSound": true
},
{
"callsign": "5R8IC",
"lastSeen": "0001-01-01T00:00:00Z", "lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never", "lastSeenStr": "Never",
"addedAt": "2025-10-19T18:18:58.8382325+02:00", "addedAt": "2025-10-18T17:18:53.3401773+02:00",
"spotCount": 0, "spotCount": 0,
"playSound": true "playSound": true
}, },
{
"callsign": "TJ1GD",
"lastSeen": "2025-10-19T17:30:20.2860148+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:18:27.6004027+02:00",
"spotCount": 11,
"playSound": true
},
{ {
"callsign": "VP2M", "callsign": "VP2M",
"lastSeen": "0001-01-01T00:00:00Z", "lastSeen": "0001-01-01T00:00:00Z",
@@ -87,6 +119,94 @@
"spotCount": 0, "spotCount": 0,
"playSound": true "playSound": true
}, },
{
"callsign": "ZL7IO",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:30.7153757+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "5R8IC",
"lastSeen": "2025-10-21T07:25:10.6322383+02:00",
"lastSeenStr": "11 hours ago",
"addedAt": "2025-10-19T18:18:58.8382325+02:00",
"spotCount": 61,
"playSound": true
},
{
"callsign": "XV9",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:24.9155327+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "5J0EA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:51.0758741+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "VP8LP",
"lastSeen": "2025-10-20T22:46:40.9079579+02:00",
"lastSeenStr": "20 hours ago",
"addedAt": "2025-10-18T17:18:49.0576187+02:00",
"spotCount": 21,
"playSound": true
},
{
"callsign": "EL2BG",
"lastSeen": "2025-10-21T05:41:57.870261+02:00",
"lastSeenStr": "13 hours ago",
"addedAt": "2025-10-18T17:18:10.2000017+02:00",
"spotCount": 22,
"playSound": true
},
{
"callsign": "YJ0CA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:33.3921665+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "TZ4AM",
"lastSeen": "2025-10-21T01:27:17.0524499+02:00",
"lastSeenStr": "17 hours ago",
"addedAt": "2025-10-18T17:19:00.3154177+02:00",
"spotCount": 46,
"playSound": true
},
{
"callsign": "H44MS",
"lastSeen": "2025-10-20T19:29:23.5019952+02:00",
"lastSeenStr": "23 hours ago",
"addedAt": "2025-10-18T17:16:49.1572859+02:00",
"spotCount": 1,
"playSound": true
},
{
"callsign": "TJ1GD",
"lastSeen": "2025-10-21T07:18:19.1978587+02:00",
"lastSeenStr": "12 hours ago",
"addedAt": "2025-10-18T17:18:27.6004027+02:00",
"spotCount": 41,
"playSound": true
},
{
"callsign": "C5LT",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:07.2442738+02:00",
"spotCount": 0,
"playSound": true
},
{ {
"callsign": "C8K", "callsign": "C8K",
"lastSeen": "0001-01-01T00:00:00Z", "lastSeen": "0001-01-01T00:00:00Z",
@@ -95,132 +215,12 @@
"spotCount": 0, "spotCount": 0,
"playSound": true "playSound": true
}, },
{
"callsign": "E51MWA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:43.6895454+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "4X6TT",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:13.335878+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "VP8LP",
"lastSeen": "2025-10-19T18:19:58.5335162+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:18:49.0576187+02:00",
"spotCount": 17,
"playSound": true
},
{
"callsign": "5X2I",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:14.6598633+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "SU0ERA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:45.8848244+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "C5R",
"lastSeen": "2025-10-19T18:19:31.7179248+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:18:04.5006892+02:00",
"spotCount": 99,
"playSound": true
},
{
"callsign": "5J0EA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:51.0758741+02:00",
"spotCount": 0,
"playSound": true
},
{ {
"callsign": "FW5K", "callsign": "FW5K",
"lastSeen": "2025-10-19T17:35:31.6022206+02:00", "lastSeen": "2025-10-21T07:17:42.220076+02:00",
"lastSeenStr": "Just now", "lastSeenStr": "12 hours ago",
"addedAt": "2025-10-18T17:17:37.9061157+02:00", "addedAt": "2025-10-18T17:17:37.9061157+02:00",
"spotCount": 75, "spotCount": 111,
"playSound": true
},
{
"callsign": "XV9",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:24.9155327+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "3B8M",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:32.6851135+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "YJ0CA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:33.3921665+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "C5LT",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:07.2442738+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "TZ4AM",
"lastSeen": "2025-10-19T13:54:22.6033432+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:19:00.3154177+02:00",
"spotCount": 27,
"playSound": true
},
{
"callsign": "H44MS",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:16:49.1572859+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "5H3MB",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:18:42.8402097+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "V85NPV",
"lastSeen": "2025-10-19T15:42:31.3912491+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:18:15.8781583+02:00",
"spotCount": 2,
"playSound": true "playSound": true
}, },
{ {
@@ -232,27 +232,43 @@
"playSound": true "playSound": true
}, },
{ {
"callsign": "5K0UA", "callsign": "V85NPV",
"lastSeen": "2025-10-19T18:24:42.7186896+02:00", "lastSeen": "2025-10-19T15:42:31.3912491+02:00",
"lastSeenStr": "Just now", "lastSeenStr": "2 days ago",
"addedAt": "2025-10-18T17:17:53.7390559+02:00", "addedAt": "2025-10-18T17:18:15.8781583+02:00",
"spotCount": 116, "spotCount": 2,
"playSound": true "playSound": true
}, },
{ {
"callsign": "E6AD", "callsign": "5X2I",
"lastSeen": "2025-10-19T18:25:32.690685+02:00",
"lastSeenStr": "Just now",
"addedAt": "2025-10-18T17:17:40.8765179+02:00",
"spotCount": 385,
"playSound": true
},
{
"callsign": "ZL7IO",
"lastSeen": "0001-01-01T00:00:00Z", "lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never", "lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:30.7153757+02:00", "addedAt": "2025-10-18T17:17:14.6598633+02:00",
"spotCount": 0, "spotCount": 0,
"playSound": true "playSound": true
},
{
"callsign": "E51MWA",
"lastSeen": "0001-01-01T00:00:00Z",
"lastSeenStr": "Never",
"addedAt": "2025-10-18T17:17:43.6895454+02:00",
"spotCount": 0,
"playSound": true
},
{
"callsign": "DP0GVN",
"lastSeen": "2025-10-21T07:20:49.6910744+02:00",
"lastSeenStr": "12 hours ago",
"addedAt": "2025-10-20T07:00:51.7088369+02:00",
"spotCount": 77,
"playSound": true
},
{
"callsign": "D2A",
"lastSeen": "2025-10-21T07:21:58.7128427+02:00",
"lastSeenStr": "11 hours ago",
"addedAt": "2025-10-20T22:11:35.4767205+02:00",
"spotCount": 76,
"playSound": true
} }
] ]