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

[scrobbles] Little reorg and trying to fix JF stop issue

Browse Source
This commit is contained in:
Colin Powell
2024-04-22 14:05:42 -04:00
parent 99ad2f797f
commit c28f93a1bb
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -889,11 +889,13 @@ class Scrobble(TimeStampedModel):
}, },
) )
playback_status = scrobble_data.pop( scrobble_data["playback_status"] = scrobble_data.get(
"mopidy_status", scrobble_data.pop("jellyfin_status", None) "mopidy_status", scrobble_data.get("jellyfin_status", None)
) )
# If it's marked as stopped, send it through our update mechanism, which will complete it
if scrobble and ( if scrobble and (
scrobble.can_be_updated or playback_status == "stopped" scrobble.can_be_updated
or scrobble_data["playback_status"] == "stopped"
): ):
return scrobble.update(scrobble_data) return scrobble.update(scrobble_data)
@ -1019,9 +1021,7 @@ class Scrobble(TimeStampedModel):
def update(self, scrobble_data: dict) -> "Scrobble": def update(self, scrobble_data: dict) -> "Scrobble":
# Status is a field we get from Mopidy, which refuses to poll us # Status is a field we get from Mopidy, which refuses to poll us
scrobble_status = scrobble_data.pop("mopidy_status", None) playback_status = scrobble_data.pop("playback_status", None)
if not scrobble_status:
scrobble_status = scrobble_data.pop("jellyfin_status", None)
logger.info( logger.info(
"[scrobbling] update called", "[scrobbling] update called",
@ -1029,26 +1029,20 @@ class Scrobble(TimeStampedModel):
"scrobble_id": self.id, "scrobble_id": self.id,
"scrobble_data": scrobble_data, "scrobble_data": scrobble_data,
"media_type": self.media_type, "media_type": self.media_type,
"scrobble_status": scrobble_status, "playback_status": playback_status,
}, },
) )
# This is really expensive on the DB ... do we need to track this?
# if self.percent_played < 100:
# # Only worry about ticks if we haven't gotten to the end
# self.update_ticks(scrobble_data)
if self.beyond_completion_percent: if self.beyond_completion_percent:
scrobble_status = "stopped" playback_status = "stopped"
if scrobble_status == "stopped": if playback_status == "stopped":
self.stop() self.stop()
if scrobble_status == "paused": if playback_status == "paused":
self.pause() self.pause()
if scrobble_status == "resumed": if playback_status == "resumed":
self.resume() self.resume()
if scrobble_status != "resumed": if playback_status != "resumed":
scrobble_data["stop_timestamp"] = ( scrobble_data["stop_timestamp"] = (
scrobble_data.pop("timestamp", None) or timezone.now() scrobble_data.pop("timestamp", None) or timezone.now()
) )
@ -1067,7 +1061,7 @@ class Scrobble(TimeStampedModel):
extra={ extra={
"scrobble_id": self.id, "scrobble_id": self.id,
"scrobble_data": scrobble_data, "scrobble_data": scrobble_data,
"scrobble_status": scrobble_status, "playback_status": playback_status,
"media_type": self.media_type, "media_type": self.media_type,
}, },
) )