update
This commit is contained in:
parent
9ca399447c
commit
4c7a1758d6
Binary file not shown.
@ -1,6 +1,7 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"net/http"
|
||||
@ -9,6 +10,12 @@ import (
|
||||
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{}
|
||||
|
||||
@ -62,6 +69,7 @@ func (s *HTTPServer) StartHTTPServer() {
|
||||
}()
|
||||
|
||||
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)
|
||||
@ -78,7 +86,7 @@ func (s *HTTPServer) Homepage(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (s *HTTPServer) GetSpots(w http.ResponseWriter, r *http.Request) {
|
||||
spots := s.Repo.GetAllSpots("25")
|
||||
spots := s.Repo.GetAllSpots("35")
|
||||
tmpl.ExecuteTemplate(w, "spot", spots)
|
||||
}
|
||||
|
||||
|
||||
@ -92,6 +92,7 @@ func (c *TCPClient) StartClient() {
|
||||
|
||||
func (c *TCPClient) Close() {
|
||||
c.Writer.WriteString("bye")
|
||||
time.Sleep(time.Second * 2)
|
||||
}
|
||||
|
||||
func (c *TCPClient) SetFilters() {
|
||||
|
||||
@ -13,7 +13,7 @@ cluster:
|
||||
port: 7300
|
||||
login: xv9q-2
|
||||
skimmer: true
|
||||
ft8: false
|
||||
ft8: true
|
||||
command: #SET/NOFILTER
|
||||
flex:
|
||||
ip: 10.10.10.120
|
||||
|
||||
BIN
flex.sqlite
BIN
flex.sqlite
Binary file not shown.
@ -216,8 +216,6 @@ func (fc *FlexClient) ReadLine() {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
// fc.Log.Info(message)
|
||||
|
||||
regRespSpot := *regexp.MustCompile(`R(\d+)\|0\|(\d+)\n`)
|
||||
respSpot := regRespSpot.FindStringSubmatch(message)
|
||||
|
||||
@ -253,7 +251,7 @@ func (fc *FlexClient) ReadLine() {
|
||||
if len(respDelete) > 0 {
|
||||
spot, _ := fc.Repo.FindSpotByFlexSpotNumber(respDelete[1])
|
||||
fc.Repo.DeleteSpotByFlexSpotNumber(respDelete[1])
|
||||
fc.Log.Infof("Spot: DX: %s - Spotter: %s - Freq: %s - Band: %s - FlexID: %v deleted from database", spot.DX, spot.SpotterCallsign, spot.FrequencyHz, spot.Band, respDelete[1])
|
||||
fc.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])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,42 +1,54 @@
|
||||
[01-10-2024 18:38:09] INFO config loaded.
|
||||
[01-10-2024 18:38:09] INFO Callsign: XV9Q
|
||||
[01-10-2024 18:38:09] INFO deleting existing database
|
||||
[01-10-2024 18:38:09] INFO Opening SQLite database
|
||||
[01-10-2024 18:38:09] INFO starting HTTP server on 0.0.0.0:3000
|
||||
[01-10-2024 18:38:09] INFO telnet server listening on 0.0.0.0:7301
|
||||
[01-10-2024 18:38:09] INFO connected to flex radio at 10.10.10.120:4992
|
||||
[01-10-2024 18:38:09] DEBUG Subscribed to spot on FlexRadio and Deleted all spots from panadapter
|
||||
[01-10-2024 18:38:09] INFO connected to DX cluster dxc.k0xm.net:7300
|
||||
[01-10-2024 18:38:10] DEBUG Found login prompt...sending callsign
|
||||
[01-10-2024 18:38:12] DEBUG Skimmer is on as defined in the config file
|
||||
[01-10-2024 18:38:12] DEBUG FT8 is off as defined in the config file
|
||||
[01-10-2024 18:38:13] INFO start receiving spots
|
||||
[01-10-2024 18:38:14] DEBUG DX: KB3EOF - Spotter: W8WWV - Freq: 7060.0 - Band: 40M - Mode: CW - Comment: 18 dB 18 WPM CQ - Time: 1138Z - DXCC: 291
|
||||
[01-10-2024 18:38:14] DEBUG DX: JJ0TJS - Spotter: JN1ILK - Freq: 7012.8 - Band: 40M - Mode: CW - Comment: 7 dB 14 WPM CQ - Time: 1138Z - DXCC: 339
|
||||
[01-10-2024 18:38:14] DEBUG DX: VE3NFN - Spotter: G4IRN - Freq: 21005.5 - Band: 15M - Mode: CW - Comment: 14 dB 30 WPM CQ - Time: 1138Z - DXCC: 1
|
||||
[01-10-2024 18:38:15] DEBUG DX: DL6LV - Spotter: EA5WU - Freq: 18072.0 - Band: 17M - Mode: CW - Comment: 10 dB 23 WPM CQ - Time: 1138Z - DXCC: 230
|
||||
[01-10-2024 18:38:15] DEBUG DX: K8DSS - Spotter: WS3W - Freq: 7034.0 - Band: 40M - Mode: CW - Comment: 18 dB 18 WPM CQ - Time: 1138Z - DXCC: 291
|
||||
[01-10-2024 18:38:16] DEBUG DX: VE3NFN - Spotter: DL0PF - Freq: 21005.6 - Band: 15M - Mode: CW - Comment: 7 dB 30 WPM CQ - Time: 1138Z - DXCC: 1
|
||||
[01-10-2024 18:38:16] DEBUG DX: VE2CSI - Spotter: 5Z4GO - Freq: 28018.0 - Band: 10M - Mode: CW - Comment: 9 dB 27 WPM CQ - Time: 1138Z - DXCC: 1
|
||||
[01-10-2024 18:38:17] DEBUG DX: M1VHT - Spotter: MM3NDH - Freq: 14006.7 - Band: 20M - Mode: CW - Comment: 2 dB 17 WPM CQ - Time: 1138Z - DXCC: 223
|
||||
[01-10-2024 18:38:19] DEBUG DX: EA3TSCU - Spotter: DL8LAS - Freq: 14052.3 - Band: 20M - Mode: CW - Comment: 13 dB 12 WPM CQ - Time: 1138Z - DXCC: 281
|
||||
[01-10-2024 18:38:21] DEBUG DX: 4X6TU - Spotter: DD5XX - Freq: 18110.0 - Band: 17M - Mode: CW - Comment: 19 dB 20 WPM NCDXF BCN - Time: 1138Z - DXCC: 997
|
||||
[01-10-2024 18:38:21] DEBUG DX: G4FOC - Spotter: G4IRN - Freq: 21025.3 - Band: 15M - Mode: CW - Comment: 18 dB 21 WPM CQ - Time: 1138Z - DXCC: 223
|
||||
[01-10-2024 18:38:22] DEBUG DX: HB9CCL - Spotter: JN1ILK - Freq: 21017.2 - Band: 15M - Mode: CW - Comment: 23 dB 20 WPM CQ - Time: 1138Z - DXCC: 287
|
||||
[01-10-2024 18:38:25] DEBUG DX: OH2B - Spotter: DF2CK - Freq: 18110.0 - Band: 17M - Mode: CW - Comment: 13 dB 22 WPM NCDXF BCN - Time: 1138Z - DXCC: 997
|
||||
[01-10-2024 18:38:27] DEBUG DX: GB2NZ - Spotter: UY2RA - Freq: 21027.7 - Band: 15M - Mode: CW - Comment: 13 dB 28 WPM CQ - Time: 1138Z - DXCC: 223
|
||||
[01-10-2024 18:38:28] DEBUG DX: N9QU - Spotter: W3OA - Freq: 14066.6 - Band: 20M - Mode: CW - Comment: 17 dB 18 WPM CQ - Time: 1138Z - DXCC: 291
|
||||
[01-10-2024 18:38:28] DEBUG DX: G0TUE - Spotter: DL8TG - Freq: 14060.5 - Band: 20M - Mode: CW - Comment: 4 dB 21 WPM CQ - Time: 1138Z - DXCC: 223
|
||||
[01-10-2024 18:38:29] DEBUG DX: RN1KA - Spotter: LZ5DI - Freq: 28031.9 - Band: 10M - Mode: CW - Comment: 15 dB 21 WPM CQ - Time: 1138Z - DXCC: 54
|
||||
[01-10-2024 18:38:29] DEBUG DX: G0TUE - Spotter: DM6EE - Freq: 14060.5 - Band: 20M - Mode: CW - Comment: 13 dB 21 WPM CQ - Time: 1138Z - DXCC: 223
|
||||
[01-10-2024 18:38:33] DEBUG DX: CS3B - Spotter: G0KTN - Freq: 14100.0 - Band: 20M - Mode: CW - Comment: 13 dB 22 WPM NCDXF BCN - Time: 1138Z - DXCC: 256
|
||||
[01-10-2024 18:38:38] DEBUG DX: W9VC - Spotter: K6FOD - Freq: 10106.7 - Band: 30M - Mode: CW - Comment: 13 dB 21 WPM CQ - Time: 1138Z - DXCC: 291
|
||||
[01-10-2024 18:38:38] DEBUG DX: OH2B - Spotter: HB9DCO - Freq: 21150.0 - Band: 15M - Mode: CW - Comment: 2 dB 22 WPM NCDXF BCN - Time: 1138Z - DXCC: 997
|
||||
[01-10-2024 18:38:41] DEBUG DX: AD9Y - Spotter: VE7CC - Freq: 7047.0 - Band: 40M - Mode: CW - Comment: 8 dB 7 WPM CQ - Time: 1138Z - DXCC: 291
|
||||
[01-10-2024 18:38:43] DEBUG DX: 4X6TU - Spotter: VU2PTT - Freq: 24930.0 - Band: 12M - Mode: CW - Comment: 8 dB 22 WPM NCDXF BCN - Time: 1138Z - DXCC: 997
|
||||
[01-10-2024 18:38:47] DEBUG DX: M6KET - Spotter: W1NT - Freq: 14060.0 - Band: 20M - Mode: CW - Comment: 6 dB 16 WPM CQ - Time: 1138Z - DXCC: 223
|
||||
[01-10-2024 18:38:48] DEBUG DX: JJ2KJN - Spotter: JH7CSU - Freq: 7021.0 - Band: 40M - Mode: CW - Comment: 19 dB 14 WPM CQ - Time: 1138Z - DXCC: 339
|
||||
[01-10-2024 18:38:48] DEBUG DX: M6KET - Spotter: DL8TG - Freq: 14059.9 - Band: 20M - Mode: CW - Comment: 23 dB 15 WPM CQ - Time: 1138Z - DXCC: 223
|
||||
[01-10-2024 18:38:53] DEBUG DX: JJ2KJN - Spotter: JN1ILK - Freq: 7021.0 - Band: 40M - Mode: CW - Comment: 23 dB 13 WPM CQ - Time: 1138Z - DXCC: 339
|
||||
[01-10-2024 18:38:53] DEBUG DX: JA1LNQ - Spotter: 7N4XCV - Freq: 7010.0 - Band: 40M - Mode: CW - Comment: 17 dB 17 WPM CQ - Time: 1138Z - DXCC: 339
|
||||
[01-10-2024 18:38:57] DEBUG DX: N8BB - Spotter: W1NT - Freq: 7062.0 - Band: 40M - Mode: CW - Comment: 20 dB 25 WPM CQ - Time: 1138Z - DXCC: 291
|
||||
[09-10-2024 20:36:03] INFO config loaded.
|
||||
[09-10-2024 20:36:03] INFO Callsign: XV9Q
|
||||
[09-10-2024 20:36:03] INFO deleting existing database
|
||||
[09-10-2024 20:36:03] INFO Opening SQLite database
|
||||
[09-10-2024 20:36:03] INFO starting HTTP server on 0.0.0.0:3000
|
||||
[09-10-2024 20:36:03] INFO telnet server listening on 0.0.0.0:7301
|
||||
[09-10-2024 20:36:03] INFO connected to flex radio at 10.10.10.120:4992
|
||||
[09-10-2024 20:36:03] DEBUG Subscribed to spot on FlexRadio and Deleted all spots from panadapter
|
||||
[09-10-2024 20:36:04] INFO connected to DX cluster dxc.k0xm.net:7300
|
||||
[09-10-2024 20:36:05] DEBUG Found login prompt...sending callsign
|
||||
[09-10-2024 20:36:07] DEBUG FT8 is on as defined in the config file
|
||||
[09-10-2024 20:36:07] DEBUG Skimmer is on as defined in the config file
|
||||
[09-10-2024 20:36:08] INFO start receiving spots
|
||||
[09-10-2024 20:36:15] DEBUG (** New DXCC **) DX: 7X4AN - Spotter: OE9GHV - Freq: 21017.6 - Band: 15M - Mode: CW - Comment: 14 dB 26 WPM CQ - Time: 1736Z - Command: 0, FlexSpot: 0
|
||||
[09-10-2024 20:36:16] DEBUG DX: DL2MIJ - Spotter: K9IMM - Freq: 24915.0 - Band: 12M - Mode: FT8 - Comment: - 8 dB 1451 Hz - Time: 1736Z - DXCC: 230
|
||||
[09-10-2024 20:36:17] DEBUG DX: KE7BJ - Spotter: K9IMM - Freq: 14074.0 - Band: 20M - Mode: FT8 - Comment: +10 dB 2784 Hz - Time: 1736Z - DXCC: 291
|
||||
[09-10-2024 20:36:17] DEBUG DX: KJ4IR - Spotter: K9IMM - Freq: 14074.0 - Band: 20M - Mode: FT8 - Comment: - 6 dB 2342 Hz - Time: 1736Z - DXCC: 291
|
||||
[09-10-2024 20:36:18] DEBUG (** New Band **) DX: E77EA - Spotter: R6YY - Freq: 7023.5 - Band: 40M - Mode: CW - Comment: 21 dB 40 WPM CQ - Time: 1736Z - DXCC: 501
|
||||
[09-10-2024 20:36:18] DEBUG DX: R7KBB - Spotter: DE1LON - Freq: 14021.5 - Band: 20M - Mode: CW - Comment: 28 dB 32 WPM CQ - Time: 1736Z - DXCC: 54
|
||||
[09-10-2024 20:36:19] DEBUG DX: IT9ZSB - Spotter: DR4W - Freq: 14033.0 - Band: 20M - Mode: CW - Comment: 4 dB 16 WPM CQ - Time: 1736Z - DXCC: 248
|
||||
[09-10-2024 20:36:20] DEBUG (** New Band **) DX: S52W - Spotter: ON6ZQ - Freq: 7022.0 - Band: 40M - Mode: CW - Comment: 28 dB 33 WPM CQ - Time: 1736Z - DXCC: 499
|
||||
[09-10-2024 20:36:20] DEBUG (** New Band **) DX: UR7MZ - Spotter: PA0MBO - Freq: 7016.5 - Band: 40M - Mode: CW - Comment: 13 dB 39 WPM CQ - Time: 1736Z - DXCC: 288
|
||||
[09-10-2024 20:36:21] DEBUG (** New Band **) DX: HG5E - Spotter: V51YJ - Freq: 7018.8 - Band: 40M - Mode: CW - Comment: 13 dB 41 WPM CQ - Time: 1736Z - DXCC: 239
|
||||
[09-10-2024 20:36:21] DEBUG (** New Band **) DX: R3THJ - Spotter: YO2CK - Freq: 3573.0 - Band: 80M - Mode: FT8 - Comment: -11 dB 1616 Hz - Time: 1736Z - DXCC: 54
|
||||
[09-10-2024 20:36:23] DEBUG DX: UA7KA - Spotter: G3XBI - Freq: 7016.0 - Band: 40M - Mode: CW - Comment: 19 dB 36 WPM CQ - Time: 1736Z - DXCC: 54
|
||||
[09-10-2024 20:36:24] DEBUG (** New Band **) DX: LZ2XA - Spotter: ZS1NN - Freq: 7024.9 - Band: 40M - Mode: CW - Comment: 8 dB 43 WPM CQ - Time: 1736Z - DXCC: 212
|
||||
[09-10-2024 20:36:24] DEBUG (** New Band **) DX: LZ7DL - Spotter: YO2CK - Freq: 7007.7 - Band: 40M - Mode: CW - Comment: 23 dB 27 WPM CQ - Time: 1736Z - DXCC: 212
|
||||
[09-10-2024 20:36:26] DEBUG DX: EA4AGA - Spotter: YO2CK - Freq: 21074.0 - Band: 15M - Mode: FT8 - Comment: + 2 dB 804 Hz - Time: 1736Z - DXCC: 281
|
||||
[09-10-2024 20:36:26] DEBUG DX: F1HFP - Spotter: YO2CK - Freq: 21074.0 - Band: 15M - Mode: FT8 - Comment: - 3 dB 2080 Hz - Time: 1736Z - DXCC: 227
|
||||
[09-10-2024 20:36:27] DEBUG DX: VE3NM - Spotter: YO2CK - Freq: 21074.0 - Band: 15M - Mode: FT8 - Comment: -19 dB 1732 Hz - Time: 1736Z - DXCC: 1
|
||||
[09-10-2024 20:36:28] DEBUG DX: UR5WAN - Spotter: YO2CK - Freq: 18095.0 - Band: 17M - Mode: FT8 - Comment: -11 dB 1377 Hz - Time: 1736Z - DXCC: 288
|
||||
[09-10-2024 20:36:29] DEBUG DX: K1SM - Spotter: YO2CK - Freq: 24915.0 - Band: 12M - Mode: FT8 - Comment: - 8 dB 1417 Hz - Time: 1736Z - DXCC: 291
|
||||
[09-10-2024 20:36:29] DEBUG DX: DG5PW - Spotter: YO2CK - Freq: 14074.0 - Band: 20M - Mode: FT8 - Comment: +12 dB 1582 Hz - Time: 1736Z - DXCC: 230
|
||||
[09-10-2024 20:36:30] DEBUG DX: F4BJN - Spotter: YO2CK - Freq: 14074.0 - Band: 20M - Mode: FT8 - Comment: - 2 dB 1568 Hz - Time: 1736Z - DXCC: 227
|
||||
[09-10-2024 20:36:31] DEBUG DX: VE1KCO - Spotter: YO2CK - Freq: 14074.0 - Band: 20M - Mode: FT8 - Comment: -15 dB 1321 Hz - Time: 1736Z - DXCC: 1
|
||||
[09-10-2024 20:36:31] DEBUG DX: PA2A - Spotter: LZ4UX - Freq: 7013.1 - Band: 40M - Mode: CW - Comment: 27 dB 35 WPM CQ - Time: 1736Z - DXCC: 263
|
||||
[09-10-2024 20:36:32] DEBUG DX: DK8RE - Spotter: LZ4UX - Freq: 10136.0 - Band: 30M - Mode: FT8 - Comment: - 9 dB 1825 Hz - Time: 1736Z - DXCC: 230
|
||||
[09-10-2024 20:36:32] DEBUG (** New Band **) DX: OH1FOL - Spotter: LZ4UX - Freq: 7074.0 - Band: 40M - Mode: FT8 - Comment: + 0 dB 1106 Hz - Time: 1736Z - DXCC: 224
|
||||
[09-10-2024 20:36:33] DEBUG DX: N4ZZ - Spotter: WC2L - Freq: 24915.0 - Band: 12M - Mode: FT8 - Comment: -17 dB 1555 Hz - Time: 1736Z - DXCC: 291
|
||||
[09-10-2024 20:36:34] DEBUG (** New Band **) DX: LY3PW - Spotter: 2E0INH - Freq: 7074.0 - Band: 40M - Mode: FT8 - Comment: -11 dB 1344 Hz - Time: 1736Z - DXCC: 146
|
||||
[09-10-2024 20:36:34] DEBUG (** New Band **) DX: OM6APJ - Spotter: 2E0INH - Freq: 7074.0 - Band: 40M - Mode: FT8 - Comment: -14 dB 1759 Hz - Time: 1736Z - DXCC: 504
|
||||
[09-10-2024 20:36:35] DEBUG DX: 2E0SFN - Spotter: W1NT - Freq: 18100.0 - Band: 17M - Mode: FT8 - Comment: - 1 dB 1065 Hz - Time: 1736Z - DXCC: 223
|
||||
[09-10-2024 20:36:37] DEBUG DX: M0PAW - Spotter: G4IRN - Freq: 18100.0 - Band: 17M - Mode: FT8 - Comment: - 8 dB 1216 Hz - Time: 1736Z - DXCC: 223
|
||||
[09-10-2024 20:36:38] DEBUG DX: DF1JC - Spotter: G4IRN - Freq: 28074.0 - Band: 10M - Mode: FT8 - Comment: +25 dB 1692 Hz - Time: 1736Z - DXCC: 230
|
||||
[09-10-2024 20:36:39] DEBUG DX: DL9VN - Spotter: G4IRN - Freq: 21074.0 - Band: 15M - Mode: FT8 - Comment: +17 dB 2133 Hz - Time: 1736Z - DXCC: 230
|
||||
[09-10-2024 20:36:39] DEBUG DX: DO1IET - Spotter: G4IRN - Freq: 21074.0 - Band: 15M - Mode: FT8 - Comment: + 2 dB 1840 Hz - Time: 1736Z - DXCC: 230
|
||||
[09-10-2024 20:36:40] DEBUG (** New Band **) DX: EA4ON - Spotter: OH4KA - Freq: 7029.0 - Band: 40M - Mode: CW - Comment: 5 dB 19 WPM CQ - Time: 1736Z - DXCC: 281
|
||||
[09-10-2024 20:36:41] DEBUG (** New Band **) DX: YU1RA - Spotter: OH6BG - Freq: 7022.5 - Band: 40M - Mode: CW - Comment: 6 dB 30 WPM CQ - Time: 1736Z - DXCC: 296
|
||||
[09-10-2024 20:36:41] DEBUG (** New Band **) DX: EA3ENB - Spotter: DK9IP - Freq: 7036.0 - Band: 40M - Mode: CW - Comment: 11 dB 16 WPM CQ - Time: 1736Z - DXCC: 281
|
||||
[09-10-2024 20:36:42] DEBUG DX: W7MD - Spotter: CT7ANO - Freq: 28074.0 - Band: 10M - Mode: FT8 - Comment: -20 dB 2533 Hz - Time: 1736Z - DXCC: 291
|
||||
[09-10-2024 20:36:43] DEBUG DX: KS4OT - Spotter: CT7ANO - Freq: 28074.0 - Band: 10M - Mode: FT8 - Comment: -18 dB 1076 Hz - Time: 1736Z - DXCC: 291
|
||||
[09-10-2024 20:36:43] DEBUG DX: R1CCE - Spotter: CT7ANO - Freq: 21074.0 - Band: 15M - Mode: FT8 - Comment: -12 dB 2243 Hz - Time: 1736Z - DXCC: 54
|
||||
[09-10-2024 20:36:44] DEBUG DX: OZ1KFQ - Spotter: CT7ANO - Freq: 21074.0 - Band: 15M - Mode: FT8 - Comment: -12 dB 2533 Hz - Time: 1736Z - DXCC: 221
|
||||
[09-10-2024 20:36:44] DEBUG DX: KE8KWU - Spotter: VE3EID - Freq: 24915.0 - Band: 12M - Mode: FT8 - Comment: - 7 dB 1364 Hz - Time: 1736Z - DXCC: 291
|
||||
|
||||
9
go.mod
9
go.mod
@ -9,10 +9,19 @@ require (
|
||||
)
|
||||
|
||||
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
|
||||
golang.org/x/crypto v0.27.0 // indirect
|
||||
golang.org/x/sys v0.25.0 // indirect
|
||||
|
||||
25
go.sum
25
go.sum
@ -1,8 +1,26 @@
|
||||
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/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=
|
||||
@ -11,24 +29,31 @@ 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/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.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=
|
||||
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/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/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=
|
||||
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/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 95 KiB |
BIN
images/icon.ico
Normal file
BIN
images/icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
1
images/icon.svg
Normal file
1
images/icon.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 8.3 KiB |
14
main.go
14
main.go
@ -5,6 +5,7 @@ import (
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
@ -12,9 +13,12 @@ func ParseFlags() (string, error) {
|
||||
// String that contains the configured configuration path
|
||||
var configPath string
|
||||
|
||||
exe, _ := os.Executable()
|
||||
defaultCfgPath := filepath.Dir(exe)
|
||||
defaultCfgPath = filepath.Join(defaultCfgPath, "/config.yml")
|
||||
// Set up a CLI flag called "-config" to allow users
|
||||
// to supply the configuration file
|
||||
flag.StringVar(&configPath, "config", "./config.yml", "path to config file")
|
||||
flag.StringVar(&configPath, "config", defaultCfgPath, "path to config file")
|
||||
|
||||
// Actually parse the flags
|
||||
flag.Parse()
|
||||
@ -28,6 +32,14 @@ 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
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<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-gray-900 whitespace-nowrap dark:text-white"> {{ else if .NewMode }}<th scope="row" class="px-1 py-1 font-medium text-gray-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>
|
||||
{{ 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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user