oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/dbus/ReadIter: add ForEachProperty()

This commit is contained in:
Max Kellermann 2018-06-03 20:06:37 +02:00
parent fbfbc5682a
commit e560f6bc63
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/dbus/ReadIter.hxx
View File

@ -102,6 +102,28 @@ public:
f(i.Recurse()); f(i.Recurse());
}); });
} }
/**
* Invoke a function for each name/value pair (string/variant)
* in a dictionary (array containing #DBUS_TYPE_DICT_ENTRY).
* The function gets two parameters: the property name (as C
* string) and the variant value (as #ReadMessageIter).
*/
template<typename F>
void ForEachProperty(F &&f) {
ForEachRecurse(DBUS_TYPE_DICT_ENTRY, [&f](auto &&i){
if (i.GetArgType() != DBUS_TYPE_STRING)
return;
const char *name = i.GetString();
i.Next();
if (i.GetArgType() != DBUS_TYPE_VARIANT)
return;
f(name, i.Recurse());
});
}
}; };
} /* namespace ODBus */ } /* namespace ODBus */

42
src/neighbor/plugins/UdisksNeighborPlugin.cxx
View File

@ -202,44 +202,23 @@ CheckString(I &&i) noexcept
return i.GetString(); return i.GetString();
} }
template<typename I>
gcc_pure
static const char *
CheckVariantString(I &&i) noexcept
{
if (i.GetArgType() != DBUS_TYPE_VARIANT)
return nullptr;
return CheckString(i.Recurse());
}
static void static void
ParseDriveDictEntry(UdisksObject &o, ODBus::ReadMessageIter &&i) noexcept ParseDriveDictEntry(UdisksObject &o, const char *name,
ODBus::ReadMessageIter &&value_i) noexcept
{ {
if (i.GetArgType() != DBUS_TYPE_STRING)
return;
const char *name = i.GetString();
i.Next();
if (StringIsEqual(name, "Id")) { if (StringIsEqual(name, "Id")) {
const char *value = CheckVariantString(i); const char *value = CheckString(value_i);
if (value != nullptr && o.drive_id.empty()) if (value != nullptr && o.drive_id.empty())
o.drive_id = value; o.drive_id = value;
} }
} }
static void static void
ParseBlockDictEntry(UdisksObject &o, ODBus::ReadMessageIter &&i) noexcept ParseBlockDictEntry(UdisksObject &o, const char *name,
ODBus::ReadMessageIter &&value_i) noexcept
{ {
if (i.GetArgType() != DBUS_TYPE_STRING)
return;
const char *name = i.GetString();
i.Next();
if (StringIsEqual(name, "Id")) { if (StringIsEqual(name, "Id")) {
const char *value = CheckVariantString(i); const char *value = CheckString(value_i);
if (value != nullptr && o.block_id.empty()) if (value != nullptr && o.block_id.empty())
o.block_id = value; o.block_id = value;
} }
@ -249,12 +228,13 @@ static void
ParseInterface(UdisksObject &o, const char *interface, ParseInterface(UdisksObject &o, const char *interface,
ODBus::ReadMessageIter &&i) noexcept ODBus::ReadMessageIter &&i) noexcept
{ {
using namespace std::placeholders;
if (StringIsEqual(interface, "org.freedesktop.UDisks2.Drive")) { if (StringIsEqual(interface, "org.freedesktop.UDisks2.Drive")) {
for (; i.GetArgType() == DBUS_TYPE_DICT_ENTRY; i.Next()) i.ForEachProperty(std::bind(ParseDriveDictEntry,
ParseDriveDictEntry(o, i.Recurse()); std::ref(o), _1, _2));
} else if (StringIsEqual(interface, "org.freedesktop.UDisks2.Block")) { } else if (StringIsEqual(interface, "org.freedesktop.UDisks2.Block")) {
for (; i.GetArgType() == DBUS_TYPE_DICT_ENTRY; i.Next()) i.ForEachProperty(std::bind(ParseBlockDictEntry,
ParseBlockDictEntry(o, i.Recurse()); std::ref(o), _1, _2));
} else if (StringIsEqual(interface, "org.freedesktop.UDisks2.Filesystem")) { } else if (StringIsEqual(interface, "org.freedesktop.UDisks2.Filesystem")) {
o.is_filesystem = true; o.is_filesystem = true;
} }