weather: fix fallback temporarily

core/internal/geolocation/client.go

@@ -3,12 +3,23 @@ package geolocation
 import "github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 
 func NewClient() Client {
-	if geoclueClient, err := newGeoClueClient(); err != nil {
+	geoclueClient, err := newGeoClueClient()
+	if err != nil {
 		log.Warnf("Failed to initialize GeoClue2 client: %v", err)
-	} else {
+		log.Info("Falling back to IP location")
+		return newIpClient()
+	}
+
+	loc, _ := geoclueClient.GetLocation()
+	if loc.Latitude != 0 || loc.Longitude != 0 {
 		return geoclueClient
 	}
 
-	log.Info("Falling back to IP location")
-	return newIpClient()
+	log.Info("GeoClue2 has no fix yet, seeding with IP location")
+	ipClient := newIpClient()
+	if ipLoc, err := ipClient.GetLocation(); err == nil {
+		geoclueClient.SeedLocation(ipLoc)
+	}
+
+	return geoclueClient
 }

core/internal/geolocation/client_geoclue.go

@@ -222,6 +222,13 @@ func (c *GeoClueClient) notifySubscribers() {
 	})
 }
 
+func (c *GeoClueClient) SeedLocation(loc Location) {
+	c.locationMutex.Lock()
+	defer c.locationMutex.Unlock()
+	c.currLocation.Latitude = loc.Latitude
+	c.currLocation.Longitude = loc.Longitude
+}
+
 func (c *GeoClueClient) GetLocation() (Location, error) {
 	c.locationMutex.RLock()
 	defer c.locationMutex.RUnlock()

core/internal/geolocation/client_ip.go

@@ -31,10 +31,8 @@ func newIpClient() *IpClient {
 
 func (c *IpClient) Subscribe(id string) chan Location {
 	ch := make(chan Location, 1)
-	if location, err := c.GetLocation(); err != nil {
+	if location, err := c.GetLocation(); err == nil {
 		ch <- location
-	} else {
-		close(ch)
 	}
 
 	return ch

core/internal/server/location/manager.go

@@ -14,8 +14,9 @@ func NewManager(client geolocation.Client) (*Manager, error) {
 	}
 
 	m := &Manager{
-		client: client,
-		dirty:  make(chan struct{}),
+		client:   client,
+		dirty:    make(chan struct{}),
+		stopChan: make(chan struct{}),
 
 		state: &State{
 			Latitude:  currLocation.Latitude,