Skip to content

fix: Fix Opensubsonic scrobble API not submitting finished tracks #1909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theovilardo merged 1 commit into from
May 7, 2026
Merged

fix: Fix Opensubsonic scrobble API not submitting finished tracks #1909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions app/src/main/java/com/theveloper/pixelplay/data/service/MusicService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,13 +1022,19 @@ class MusicService : MediaLibraryService() {
return getNavidromeId(mediaItem) != null
}

private fun reportNavidromePlayback(state: String) {
private fun reportNavidromePlayback(state: String, mediaItem: MediaItem? = engine.masterPlayer.currentMediaItem) {
val player = engine.masterPlayer
// Ensure we capture player state on main thread to avoid IllegalStateException
val mediaItem = player.currentMediaItem ?: return
val navidromeId = getNavidromeId(mediaItem) ?: return
val targetItem = mediaItem ?: return
val navidromeId = getNavidromeId(targetItem) ?: return

val positionMs = player.currentPosition
// If reporting for current item, use player position.
// If reporting "stopped" for a transition, use the item's duration as final position.
val positionMs = if (targetItem === player.currentMediaItem) {
player.currentPosition
} else {
targetItem.mediaMetadata.extras?.getLong(MediaItemBuilder.EXTERNAL_EXTRA_DURATION) ?: 0L
}
val playbackRate = player.playbackParameters.speed

// Use appScope for the network call so it survives if serviceScope is cancelled
Expand Down Expand Up @@ -1160,6 +1166,20 @@ class MusicService : MediaLibraryService() {
val state = if (engine.masterPlayer.isPlaying) "playing" else "paused"
reportNavidromePlayback(state)
}

if (reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION) {
val finishedItem = oldPosition.mediaItem
if (isNavidromeMediaItem(finishedItem)) {
val prevId = getNavidromeId(finishedItem)
reportNavidromePlayback("stopped", finishedItem)
if (prevId != null) {
appScope.launch(Dispatchers.IO) {
navidromeRepository.scrobble(prevId, submission = true)
}
}
}
}

if (reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION ||
reason == Player.DISCONTINUITY_REASON_SEEK
) {
Expand Down
Loading