diff options
author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2011-11-23 17:05:16 +0000 |
---|---|---|
committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2011-11-23 17:05:16 +0000 |
commit | 76ad92ad8d724a127d61a9e55f3d9c21b00ada5e (patch) | |
tree | ce663b50023cc5f0cd08b91211ab4bcf08be7fd6 | |
parent | 358a176bceb27886ea3e5a0ac4a039999290c7e3 (diff) |
Warn about using track ids in the /org/mpris namespace
-rw-r--r-- | mpris2/interfacetest.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mpris2/interfacetest.cpp b/mpris2/interfacetest.cpp index c370fc0..a2a6cb9 100644 --- a/mpris2/interfacetest.cpp +++ b/mpris2/interfacetest.cpp @@ -332,8 +332,13 @@ void InterfaceTest::checkMetadata(const QVariantMap& metadata, (*errors) << "No mpris:trackid entry"; } else if (metadata.value("mpris:trackid").userType() != qMetaTypeId<QDBusObjectPath>()) { (*errors) << "mpris:trackid entry was not sent as a D-Bus object path (D-Bus type 'o')"; - } else if (metadata.value("mpris:trackid").value<QDBusObjectPath>().path().isEmpty()) { - (*errors) << "mpris:trackid entry is an empty path"; + } else { + QDBusObjectPath trackid = metadata.value("mpris:trackid").value<QDBusObjectPath>(); + if (trackid.path().isEmpty()) { + (*errors) << "mpris:trackid entry is an empty path"; + } else if (trackid.path().startsWith("/org/mpris/")) { + (*warnings) << "The /org/mpris/ namespace is reserved, and should not be used for track ids"; + } } checkMetadataEntry(metadata, "mpris:length", QVariant::LongLong, errors, warnings, infoMessages); |