Commit 8d5f7160 authored by Max Kellermann's avatar Max Kellermann

db/upnp: fix subdirectory paths in "listallinfo"

Add missing server name prefix.
parent b167ce29
...@@ -578,7 +578,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server, ...@@ -578,7 +578,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
case UPnPDirObject::ItemClass::MUSIC: case UPnPDirObject::ItemClass::MUSIC:
if (visit_song) if (visit_song)
return visitSong(std::move(tdirent), return visitSong(std::move(tdirent),
selection.uri.c_str(), base_uri,
selection, visit_song, selection, visit_song,
error); error);
break; break;
...@@ -615,7 +615,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server, ...@@ -615,7 +615,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
case UPnPDirObject::Type::CONTAINER: case UPnPDirObject::Type::CONTAINER:
if (visit_directory) { if (visit_directory) {
const std::string uri = PathTraitsUTF8::Build(selection.uri.c_str(), const std::string uri = PathTraitsUTF8::Build(base_uri,
dirent.name.c_str()); dirent.name.c_str());
const LightDirectory d(uri.c_str(), 0); const LightDirectory d(uri.c_str(), 0);
if (!visit_directory(d, error)) if (!visit_directory(d, error))
...@@ -635,7 +635,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server, ...@@ -635,7 +635,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
std::string p; std::string p;
if (!selection.recursive) if (!selection.recursive)
p = PathTraitsUTF8::Build(selection.uri.c_str(), p = PathTraitsUTF8::Build(base_uri,
dirent.name.c_str()); dirent.name.c_str());
if (!visitSong(std::move(dirent), if (!visitSong(std::move(dirent),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment