mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-06 13:38:28 -04:00
refactor(mpris): enrich metadata across equivalent players (#2928)
* fix(mpris): enrich metadata across equivalent players
* fix(mpris): address review feedback on source stealing and title stripping
- _bestPlayingPlayer: when the active player is playing but not
controllable, only hand ownership to a controllable peer that passes
isSameTrack; unrelated players can no longer steal the active source.
- displayTrackTitle: keep the full trackTitle for display. Suffix
stripping now only applies to the isSameTrack matching key, and only
for a known app-name allowlist (YouTube, SoundCloud, browsers, etc.)
so legitimate titles containing ' | ' are never mangled.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Port 1.5
(cherry picked from commit 594a2cde19)
This commit is contained in:
committed by
dms-ci[bot]
parent
41efe6ad15
commit
6edb985847
@@ -26,7 +26,7 @@ Singleton {
|
||||
return hash.toString(16).padStart(8, '0');
|
||||
}
|
||||
|
||||
function getArtworkUrl(player) {
|
||||
function _directArtworkUrl(player) {
|
||||
if (!player) return "";
|
||||
|
||||
let artUrl = player.trackArtUrl || "";
|
||||
@@ -54,6 +54,20 @@ Singleton {
|
||||
return "";
|
||||
}
|
||||
|
||||
function getArtworkUrl(player) {
|
||||
const directUrl = _directArtworkUrl(player);
|
||||
if (directUrl !== "")
|
||||
return directUrl;
|
||||
|
||||
const equivalent = MprisController.availablePlayers.find(candidate => {
|
||||
return candidate !== player
|
||||
&& candidate.playbackState !== MprisPlaybackState.Stopped
|
||||
&& MprisController.isSameTrack(player, candidate)
|
||||
&& _directArtworkUrl(candidate) !== "";
|
||||
});
|
||||
return _directArtworkUrl(equivalent);
|
||||
}
|
||||
|
||||
function _commit(u, artKey, srcUrl) {
|
||||
resolvedArtUrl = u;
|
||||
_committedArtKey = u !== "" ? artKey : "";
|
||||
@@ -171,11 +185,25 @@ Singleton {
|
||||
onActivePlayerChanged: _updateArtUrl()
|
||||
|
||||
Connections {
|
||||
target: root.activePlayer
|
||||
ignoreUnknownSignals: true
|
||||
function onTrackTitleChanged() { root._updateArtUrl(); }
|
||||
function onTrackArtUrlChanged() { root._updateArtUrl(); }
|
||||
function onMetadataChanged() { root._updateArtUrl(); }
|
||||
target: MprisController
|
||||
function onAvailablePlayersChanged() {
|
||||
root._updateArtUrl();
|
||||
}
|
||||
}
|
||||
|
||||
Instantiator {
|
||||
model: MprisController.availablePlayers
|
||||
delegate: Connections {
|
||||
required property MprisPlayer modelData
|
||||
target: modelData
|
||||
ignoreUnknownSignals: true
|
||||
function onIsPlayingChanged() { root._updateArtUrl(); }
|
||||
function onTrackTitleChanged() { root._updateArtUrl(); }
|
||||
function onTrackArtistChanged() { root._updateArtUrl(); }
|
||||
function onTrackAlbumChanged() { root._updateArtUrl(); }
|
||||
function onTrackArtUrlChanged() { root._updateArtUrl(); }
|
||||
function onMetadataChanged() { root._updateArtUrl(); }
|
||||
}
|
||||
}
|
||||
|
||||
function _trackKey() {
|
||||
@@ -201,8 +229,9 @@ Singleton {
|
||||
}
|
||||
_pendingArtKey = key;
|
||||
const url = getArtworkUrl(activePlayer);
|
||||
// Ignore Chrome's same-track thumbnail size updates.
|
||||
if (key !== "" && key === _committedArtKey)
|
||||
// Ignore duplicate notifications, but allow a richer peer to replace
|
||||
// the artwork for the same canonical track.
|
||||
if (key !== "" && key === _committedArtKey && url === _committedSrcUrl)
|
||||
return;
|
||||
if (key !== "" && url !== "" && url === _committedSrcUrl) {
|
||||
// Chrome can publish track metadata before its new artwork URL.
|
||||
|
||||
Reference in New Issue
Block a user