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

db/upnp: use PathTraitsUTF8::Build()

Browse Source
This commit is contained in:
Max Kellermann
2014-01-22 22:04:04 +01:00
parent e50969e31c
commit d9926a1c21
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/db/UpnpDatabasePlugin.cxx
View File

@@ -36,6 +36,7 @@
#include "tag/TagTable.hxx" #include "tag/TagTable.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "fs/Traits.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "SongFilter.hxx" #include "SongFilter.hxx"
@@ -451,9 +452,16 @@ UpnpDatabase::BuildPath(ContentDirectoryService &server,
if (!ReadNode(server, pid, dirent, error)) if (!ReadNode(server, pid, dirent, error))
return false; return false;
pid = dirent.m_pid.c_str(); pid = dirent.m_pid.c_str();
path = dirent.name + (path.empty()? "" : "/" + path);
if (path.empty())
path = dirent.name;
else
path = PathTraitsUTF8::Build(dirent.name.c_str(),
path.c_str());
} }
path = std::string(server.getFriendlyName()) + "/" + path;
path = PathTraitsUTF8::Build(server.getFriendlyName(),
path.c_str());
return true; return true;
} }
@@ -598,7 +606,8 @@ UpnpDatabase::VisitServer(ContentDirectoryService &server,
case UPnPDirObject::Type::CONTAINER: case UPnPDirObject::Type::CONTAINER:
if (visit_directory) { if (visit_directory) {
const std::string uri = selection.uri + "/" + dirent.name; const std::string uri = PathTraitsUTF8::Build(selection.uri.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))
return false; return false;
@@ -617,8 +626,8 @@ UpnpDatabase::VisitServer(ContentDirectoryService &server,
std::string p; std::string p;
if (!selection.recursive) if (!selection.recursive)
p = selection.uri + "/" + p = PathTraitsUTF8::Build(selection.uri.c_str(),
dirent.name; dirent.name.c_str());
if (!visitSong(std::move(dirent), if (!visitSong(std::move(dirent),
p.c_str(), p.c_str(),