weather: fix geoclue IP fallback

core/internal/geolocation/client.go

@@ -5,21 +5,38 @@ import "github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 func NewClient() Client {
 	geoclueClient, err := newGeoClueClient()
 	if err != nil {
-		log.Warnf("Failed to initialize GeoClue2 client: %v", err)
-		log.Info("Falling back to IP location")
-		return newIpClient()
+		log.Warnf("GeoClue2 unavailable: %v", err)
+		return newSeededIpClient()
 	}
 
 	loc, _ := geoclueClient.GetLocation()
 	if loc.Latitude != 0 || loc.Longitude != 0 {
+		log.Info("Using GeoClue2 location")
 		return geoclueClient
 	}
 
 	log.Info("GeoClue2 has no fix yet, seeding with IP location")
-	ipClient := newIpClient()
-	if ipLoc, err := ipClient.GetLocation(); err == nil {
-		geoclueClient.SeedLocation(ipLoc)
+	ipLoc, err := fetchIPLocation()
+	if err != nil {
+		log.Warnf("IP location seed failed: %v", err)
+		return geoclueClient
 	}
 
+	log.Info("Seeded GeoClue2 with IP location")
+	geoclueClient.SeedLocation(Location{Latitude: ipLoc.Latitude, Longitude: ipLoc.Longitude})
 	return geoclueClient
 }
+
+func newSeededIpClient() *IpClient {
+	client := newIpClient()
+	ipLoc, err := fetchIPLocation()
+	if err != nil {
+		log.Warnf("IP location also failed: %v", err)
+		return client
+	}
+
+	log.Info("Using IP location")
+	client.currLocation.Latitude = ipLoc.Latitude
+	client.currLocation.Longitude = ipLoc.Longitude
+	return client
+}