secstate/vrobbler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove funky truncation end around

Browse Source
This commit is contained in:
Colin Powell
2023-11-24 19:51:37 +01:00
parent 7a6bd169bf
commit c7d1272e99
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vrobbler/apps/locations/models.py
View File

@ -27,12 +27,6 @@ class GeoLocation(ScrobblableMixin):
class Meta: class Meta:
unique_together = [["lat", "lon", "altitude"]] unique_together = [["lat", "lon", "altitude"]]
def save(self, *args, **kwargs):
if not self.truncated_lat or not self.truncated_lon:
self.truncated_lat = float(str(self.lat)[:-3])
self.truncated_lon = float(str(self.lon)[:-3])
super(GeoLocation, self).save(*args, **kwargs)
def __str__(self): def __str__(self):
if self.title: if self.title:
return self.title return self.title
@ -55,23 +49,23 @@ class GeoLocation(ScrobblableMixin):
logger.error("No lat or lon keys in data dict") logger.error("No lat or lon keys in data dict")
return return
data_dict["lat"] = float(data_dict.get("lat", "")) if len(str(data_dict["lat"])) > 8:
data_dict["lon"] = float(data_dict.get("lon", "")) data_dict["lat"] = float(str(data_dict.get("lat", ""))[:-3])
data_dict["altitude"] = float(data_dict.get("alt", "")) if len(str(data_dict["lon"])) > 8:
data_dict["lon"] = float(str(data_dict.get("lon", ""))[:-3])
data_dict["altitude"] = float(str(data_dict.get("alt", ""))[:-3])
location = cls.objects.filter( location = cls.objects.filter(
truncated_lat=float(str(data_dict.get("lat", ""))[:-3]), lat=data_dict.get("lat"),
truncated_lon=float(str(data_dict.get("lon", ""))[:-3]), lon=data_dict.get("lon"),
altitude=data_dict.get("alt"), altitude=data_dict.get("altitude"),
).first() ).first()
if not location: if not location:
location = cls.objects.create( location = cls.objects.create(
lat=data_dict.get("lat"), lat=data_dict.get("lat"),
lon=data_dict.get("lon"), lon=data_dict.get("lon"),
truncated_lat=float(str(data_dict.get("lat", ""))[:-3]), altitude=data_dict.get("altitude"),
truncated_lon=float(str(data_dict.get("lon", ""))[:-3]),
altitude=data_dict.get("alt"),
) )
return location return location

10
vrobbler/apps/scrobbles/models.py
View File

@ -630,14 +630,8 @@ class Scrobble(TimeStampedModel):
if self.media_obj.__class__.__name__ in ["GeoLocation"]: if self.media_obj.__class__.__name__ in ["GeoLocation"]:
logger.info(f"Calculate proximity to last scrobble") logger.info(f"Calculate proximity to last scrobble")
if self.previous: if self.previous:
same_lat = ( same_lat = self.previous.media_obj.lat == self.media_obj.lat
self.previous.media_obj.truncated_lat same_lon = self.previous.media_obj.lon == self.media_obj.lon
== self.media_obj.truncated_lat
)
same_lon = (
self.previous.media_obj.truncated_lon
== self.media_obj.truncated_lon
)
if same_lat and same_lon: # We have moved if same_lat and same_lon: # We have moved
logger.info("Yes - We're in the same place!") logger.info("Yes - We're in the same place!")
updatable = True updatable = True