kosslan/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

service/mpris!: do not provide fallback track information

Browse source 
See the [!TIP] messages for more information.
This commit is contained in:
outfoxxed 2024-11-20 19:58:57 -08:00
parent e2ef7b7982
commit abb900b7ff
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/services/mpris/player.cpp
View file

@ -10,7 +10,6 @@
#include <qobject.h> #include <qobject.h>
#include <qproperty.h> #include <qproperty.h>
#include <qstring.h> #include <qstring.h>
#include <qstringliteral.h>
#include <qtmetamacros.h> #include <qtmetamacros.h>
#include <qtypes.h> #include <qtypes.h>
@ -69,23 +68,20 @@ MprisPlayer::MprisPlayer(const QString& address, QObject* parent): QObject(paren
}); });
this->bTrackTitle.setBinding([this]() { this->bTrackTitle.setBinding([this]() {
const auto& title = this->bMetadata.value().value("xesam:title").toString(); return this->bMetadata.value().value("xesam:title").toString();
return title.isNull() ? QStringLiteral("Unknown Track") : title;
}); });
this->bTrackAlbum.setBinding([this]() { this->bTrackAlbum.setBinding([this]() {
const auto& album = this->bMetadata.value().value("xesam:album").toString(); return this->bMetadata.value().value("xesam:album").toString();
return album.isNull() ? QStringLiteral("Unknown Album") : album;
}); });
this->bTrackArtist.setBinding([this]() { this->bTrackArtist.setBinding([this]() {
const auto& artist = this->bMetadata.value().value("xesam:artist").value<QList<QString>>(); const auto& artist = this->bMetadata.value().value("xesam:artist").value<QList<QString>>();
return artist.isEmpty() ? QStringLiteral("Unknown Artist") : artist.join(", "); return artist.isEmpty() ? QString() : artist.join(", ");
}); });
this->bTrackAlbumArtist.setBinding([this]() { this->bTrackAlbumArtist.setBinding([this]() {
const auto& artist = this->bMetadata.value().value("xesam:albumArtist").toString(); return this->bMetadata.value().value("xesam:albumArtist").toString();
return artist.isNull() ? QStringLiteral("Unknown Artist") : artist;
}); });
this->bTrackArtUrl.setBinding([this]() { this->bTrackArtUrl.setBinding([this]() {

20
src/services/mpris/player.hpp
View file

@ -135,15 +135,27 @@ class MprisPlayer: public QObject {
/// > [!WARNING] This is NOT `mpris:trackid` as that is sometimes missing or nonunique /// > [!WARNING] This is NOT `mpris:trackid` as that is sometimes missing or nonunique
/// > in some players. /// > in some players.
Q_PROPERTY(quint32 uniqueId READ uniqueId NOTIFY uniqueIdChanged BINDABLE bindableUniqueId); Q_PROPERTY(quint32 uniqueId READ uniqueId NOTIFY uniqueIdChanged BINDABLE bindableUniqueId);
/// The title of the current track, or "Unknown Track" if none was provided. /// The title of the current track, or `""` if none was provided.
///
/// > [!TIP] Use `player.trackTitle || "Unknown Title"` to provide a message
/// > when no title is available.
Q_PROPERTY(QString trackTitle READ trackTitle NOTIFY trackTitleChanged BINDABLE bindableTrackTitle); Q_PROPERTY(QString trackTitle READ trackTitle NOTIFY trackTitleChanged BINDABLE bindableTrackTitle);
/// The current track's artist, or an empty string if none was provided. /// The current track's artist, or an `""` if none was provided.
///
/// > [!TIP] Use `player.trackArtist || "Unknown Artist"` to provide a message
/// > when no artist is available.
Q_PROPERTY(QString trackArtist READ trackArtist NOTIFY trackArtistChanged BINDABLE bindableTrackArtist); Q_PROPERTY(QString trackArtist READ trackArtist NOTIFY trackArtistChanged BINDABLE bindableTrackArtist);
/// > [!ERROR] deprecated in favor of @@trackArtist. /// > [!ERROR] deprecated in favor of @@trackArtist.
Q_PROPERTY(QString trackArtists READ trackArtist NOTIFY trackArtistChanged BINDABLE bindableTrackArtist); Q_PROPERTY(QString trackArtists READ trackArtist NOTIFY trackArtistChanged BINDABLE bindableTrackArtist);
/// The current track's album, or "Unknown Album" if none was provided. /// The current track's album, or `""` if none was provided.
///
/// > [!TIP] Use `player.trackAlbum || "Unknown Album"` to provide a message
/// > when no album is available.
Q_PROPERTY(QString trackAlbum READ trackAlbum NOTIFY trackAlbumChanged BINDABLE bindableTrackAlbum); Q_PROPERTY(QString trackAlbum READ trackAlbum NOTIFY trackAlbumChanged BINDABLE bindableTrackAlbum);
/// The current track's album artist, or "Unknown Artist" if none was provided. /// The current track's album artist, or `""` if none was provided.
///
/// > [!TIP] Use `player.trackAlbumArtist || "Unknown Album"` to provide a message
/// > when no album artist is available.
Q_PROPERTY(QString trackAlbumArtist READ trackAlbumArtist NOTIFY trackAlbumArtistChanged BINDABLE bindableTrackAlbumArtist); Q_PROPERTY(QString trackAlbumArtist READ trackAlbumArtist NOTIFY trackAlbumArtistChanged BINDABLE bindableTrackAlbumArtist);
/// The current track's art url, or `""` if none was provided. /// The current track's art url, or `""` if none was provided.
Q_PROPERTY(QString trackArtUrl READ trackArtUrl NOTIFY trackArtUrlChanged BINDABLE bindableTrackArtUrl); Q_PROPERTY(QString trackArtUrl READ trackArtUrl NOTIFY trackArtUrlChanged BINDABLE bindableTrackArtUrl);