3 Commits

Author SHA1 Message Date
Adrian Zürcher
aa900d5e3b fix enviroment bug
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 2m11s
Build Slideshow App / build (amd64, , linux) (push) Successful in 2m25s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 2m16s
Build Slideshow App / build (arm64, , linux) (push) Successful in 2m12s
2026-02-03 09:19:06 +01:00
Adrian Zürcher
91cb3a48f8 fix active ip for all os 2026-02-03 09:18:55 +01:00
Adrian Zürcher
e05c3a06ae some changes
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 2m0s
Build Slideshow App / build (amd64, , linux) (push) Successful in 2m20s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 1m57s
Build Slideshow App / build (arm64, , linux) (push) Successful in 1m58s
2026-01-31 20:37:03 +01:00
3 changed files with 23 additions and 17 deletions

8
env/enviroment.go vendored
View File

@@ -26,7 +26,13 @@ func Load(path string) error {
} }
func (key EnvKey) GetValue() string { func (key EnvKey) GetValue() string {
return os.Getenv(string(key)) keyStr := string(key)
value := os.Getenv(keyStr)
if key == Port && value == "" {
value = "8080"
}
return value
} }
func (key EnvKey) SetValue(value string) { func (key EnvKey) SetValue(value string) {

View File

@@ -20,34 +20,34 @@ func GetLocalIP() string {
} }
func getActiveIP() string { func getActiveIP() string {
conn, err := net.Dial("udp", "8.8.8.8:80") addrs, err := net.InterfaceAddrs()
if err != nil { if err != nil {
return "" return ""
} }
defer conn.Close()
addr := conn.LocalAddr() for _, address := range addrs {
if udpAddr, ok := addr.(*net.UDPAddr); ok { if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
return udpAddr.IP.String()
if ipnet.IP.To4() != nil {
ipStr := ipnet.IP.String()
if ipnet.IP.IsLinkLocalUnicast() {
continue
}
return ipStr
}
}
} }
return "" return ""
} }
func InfoHandler(w http.ResponseWriter, r *http.Request) { func InfoHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
port := env.Port.GetValue()
if port == "" {
port = "8080"
}
speed := env.IntervalDefault.GetValue()
if speed == "" {
speed = "10"
}
data := map[string]string{ data := map[string]string{
"ip": GetLocalIP(), "ip": GetLocalIP(),
"port": port, "port": env.Port.GetValue(),
"speed": GetInterval(), "speed": GetInterval(),
} }
err := json.NewEncoder(w).Encode(data) err := json.NewEncoder(w).Encode(data)