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

[locations] Don't scrobble all the locations!

Browse Source
This commit is contained in:
Colin Powell
2024-02-12 11:59:15 -05:00
parent a637a59a40
commit 2c08336e33
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -802,6 +802,7 @@ class Scrobble(TimeStampedModel):
def user_has_moved_locations( def user_has_moved_locations(
cls, location: GeoLocation, user_id: int cls, location: GeoLocation, user_id: int
) -> bool: ) -> bool:
moved_location = False
scrobble = ( scrobble = (
cls.objects.filter( cls.objects.filter(
media_type=cls.MediaType.GEO_LOCATION, user_id=user_id media_type=cls.MediaType.GEO_LOCATION, user_id=user_id
@ -809,18 +810,30 @@ class Scrobble(TimeStampedModel):
.order_by("-timestamp") .order_by("-timestamp")
.first() .first()
) )
moved_location = True if not scrobble:
if scrobble and scrobble.media_obj != location:
logger.info( logger.info(
f"[scrobbling] New location {location} and last location {scrobble.media_obj} are different" f"[scrobbling] No existing location scrobbles, {location} should be created"
) )
past_scrobbles = Scrobble.objects.filter( moved_location = True
media_type="GeoLocation",
user_id=user_id,
).order_by("-timestamp")[1:POINTS_FOR_MOVEMENT_HISTORY]
past_points = [s.media_obj for s in past_scrobbles]
moved_location = location.has_moved(past_points) else:
if scrobble.media_obj == location:
logger.info(
f"[scrobbling] New location {location} and last location {scrobble.media_obj} are the same"
)
moved_location = False
if scrobble.media_obj != location:
logger.info(
f"[scrobbling] New location {location} and last location {scrobble.media_obj} are different"
)
past_scrobbles = Scrobble.objects.filter(
media_type="GeoLocation",
user_id=user_id,
).order_by("-timestamp")[1:POINTS_FOR_MOVEMENT_HISTORY]
past_points = [s.media_obj for s in past_scrobbles]
moved_location = location.has_moved(past_points)
return moved_location return moved_location
def update(self, scrobble_data: dict) -> "Scrobble": def update(self, scrobble_data: dict) -> "Scrobble":