Fixed last track not sent to ListenBrainz, fixes #438

docroot/js/mediaplayer.js

@@ -97,17 +97,21 @@ LMS.mediaplayer = function () {
 		_lastStartPlaying = Date.now();
 	}
 
-	let _stopTimer = function() {
+	let _pauseTimer = function() {
 		if (_lastStartPlaying != null) {
 			_playedDuration += Date.now() - _lastStartPlaying;
+			_lastStartPlaying = null;
 		}
 	}
 
 	let _resetTimer = function() {
 		if (_lastStartPlaying != null)
+			_pauseTimer();
+
+		if (_playedDuration > 0) {
 			Wt.emit(_root, "scrobbleListenFinished", _trackId, _playedDuration);
 			_playedDuration = 0;
-		_lastStartPlaying = null;
+		}
 	}
 
 	let _durationToString = function (duration) {
@@ -229,7 +233,7 @@ LMS.mediaplayer = function () {
 			navigator.mediaSession.setPositionState({
 				duration: _duration,
 				playbackRate: 1,
-				position: _offset + _elems.audio.currentTime,
+				position: Math.min(_offset + _elems.audio.currentTime, _duration),
 			});
 
 			if (_elems.audio.paused)
@@ -276,9 +280,9 @@ LMS.mediaplayer = function () {
 		_elems.audio.addEventListener("playing", _updateMediaSessionState);
 		_elems.audio.addEventListener("pause", _updateMediaSessionState);
 
-		_elems.audio.addEventListener("pause", _stopTimer);
+		_elems.audio.addEventListener("pause", _pauseTimer);
 		_elems.audio.addEventListener("playing", _startTimer);
-		_elems.audio.addEventListener("waiting", _stopTimer);
+		_elems.audio.addEventListener("waiting", _pauseTimer);
 
 		_elems.audio.addEventListener("timeupdate", function() {
 			_elems.progress.style.width = "" + ((_offset + _elems.audio.currentTime) / _duration) * 100 + "%";
@@ -286,6 +290,7 @@ LMS.mediaplayer = function () {
 		});
 
 		_elems.audio.addEventListener("ended", function() {
+			_resetTimer();
 			Wt.emit(_root, "playbackEnded");
 		});
 
@@ -366,7 +371,6 @@ LMS.mediaplayer = function () {
 	}
 
 	let loadTrack = function(params, autoplay) {
-		_stopTimer();
 		_resetTimer();
 
 		_trackId = params.trackId;

src/lms/ui/LmsApplication.cpp

@@ -489,10 +489,12 @@ namespace lms::ui
         // Events from MediaPlayer
         _mediaPlayer->playNext.connect([this]
             {
+                LMS_LOG(UI, DEBUG, "Received playNext from player");
                 _playQueue->playNext();
             });
         _mediaPlayer->playPrevious.connect([this]
             {
+                LMS_LOG(UI, DEBUG, "Received playPrevious from player");
                 _playQueue->playPrevious();
             });
 
@@ -512,6 +514,7 @@ namespace lms::ui
 
         _mediaPlayer->playbackEnded.connect([this]
             {
+                LMS_LOG(UI, DEBUG, "Received playbackEnded from player");
                 _playQueue->onPlaybackEnded();
             });
 

src/lms/ui/MediaPlayer.cpp

@@ -253,7 +253,7 @@ namespace lms::ui
                 << " trackId :\"" << trackId.toString() << "\","
                 << " nativeResource: \"" << nativeResource << "\","
                 << " transcodingResource: \"" << transcodingResource << "\","
-                << " duration: " << std::chrono::duration_cast<std::chrono::seconds>(track->getDuration()).count() << ","
+                << " duration: " << std::chrono::duration_cast<std::chrono::duration<float>>(track->getDuration()).count() << ","
                 << " replayGain: " << replayGain << ","
                 << " title: \"" << core::stringUtils::jsEscape(track->getName()) << "\","
                 << " artist: \"" << (!artists.empty() ? core::stringUtils::jsEscape(track->getArtistDisplayName()) : "") << "\","