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

db/upnp: use the generic ::CollectUniqueTags() function 

This function implements the "group" feature on top of the
Database::Visit() method.
This commit is contained in:
Max Kellermann 2018-11-19 20:08:10 +01:00
parent 841694ccf2
commit 4b7078297d
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.21.4 (not yet released)
* database
- upnp: implement "list ... group"
ver 0.21.3 (2018/11/16)
* output

23
src/db/plugins/upnp/UpnpDatabasePlugin.cxx
View File

@ -27,6 +27,7 @@
#include "db/DatabasePlugin.hxx"
#include "db/Selection.hxx"
#include "db/VHelper.hxx"
#include "db/UniqueTags.hxx"
#include "db/DatabaseError.hxx"
#include "db/LightDirectory.hxx"
#include "song/LightSong.hxx"
@ -627,27 +628,7 @@ std::map<std::string, std::set<std::string>>
UpnpDatabase::CollectUniqueTags(const DatabaseSelection &selection,
TagType tag, TagType group) const
{
(void)group; // TODO: use group
std::map<std::string, std::set<std::string>> result;
auto &values = result[std::string()];
for (auto& server : discovery->GetDirectories()) {
const auto dirbuf = SearchSongs(server, rootid, selection);
for (const auto &dirent : dirbuf.objects) {
if (dirent.type != UPnPDirObject::Type::ITEM ||
dirent.item_class != UPnPDirObject::ItemClass::MUSIC)
continue;
const char *value = dirent.tag.GetValue(tag);
if (value != nullptr) {
values.emplace(value);
}
}
}
return result;
return ::CollectUniqueTags(*this, selection, tag, group);
}
DatabaseStats