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

Fix double scrobbling for real

Browse Source
This commit is contained in:
Colin Powell
2023-01-16 20:39:27 -05:00
parent 90687a6b43
commit 7e2915850f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,6 +246,8 @@ class Scrobble(TimeStampedModel):
scrobble_status = scrobble_data.pop('mopidy_status', None) scrobble_status = scrobble_data.pop('mopidy_status', None)
if not scrobble_status: if not scrobble_status:
scrobble_status = scrobble_data.pop('jellyfin_status', None) scrobble_status = scrobble_data.pop('jellyfin_status', None)
if not scrobble_status:
scrobble_status = "resumed"
logger.debug(f"Scrobbling to {scrobble} with status {scrobble_status}") logger.debug(f"Scrobbling to {scrobble} with status {scrobble_status}")
scrobble.update_ticks(scrobble_data) scrobble.update_ticks(scrobble_data)
@ -285,7 +287,7 @@ class Scrobble(TimeStampedModel):
check_scrobble_for_finish(self) check_scrobble_for_finish(self)
def pause(self) -> None: def pause(self) -> None:
if self.is_paused and not self.played_to_completion: if self.is_paused:
logger.warning("Scrobble already paused") logger.warning("Scrobble already paused")
return return
self.is_paused = True self.is_paused = True
@ -293,15 +295,10 @@ class Scrobble(TimeStampedModel):
check_scrobble_for_finish(self) check_scrobble_for_finish(self)
def resume(self) -> None: def resume(self) -> None:
if self.is_paused or not self.played_to_completion: if self.is_paused or not self.in_progress:
self.is_paused = False self.is_paused = False
self.in_progress = True self.in_progress = True
return self.save( return self.save(update_fields=["is_paused", "in_progress"])
update_fields=[
"is_paused",
"in_progress",
]
)
def update_ticks(self, data) -> None: def update_ticks(self, data) -> None:
self.playback_position_ticks = data.get("playback_position_ticks") self.playback_position_ticks = data.get("playback_position_ticks")