OpenSubsonic API: root music folders are returned using ids
This commit is contained in:
@@ -33,12 +33,6 @@ namespace lms::api::subsonic
|
|||||||
return "dir-" + id.toString();
|
return "dir-" + id.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string idToString(db::MediaLibraryId id)
|
|
||||||
{
|
|
||||||
// No need to prefix as this is only used at well known places
|
|
||||||
return id.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string idToString(db::ReleaseId id)
|
std::string idToString(db::ReleaseId id)
|
||||||
{
|
{
|
||||||
return "al-" + id.toString();
|
return "al-" + id.toString();
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ namespace lms::api::subsonic
|
|||||||
{
|
{
|
||||||
std::string idToString(db::ArtistId id);
|
std::string idToString(db::ArtistId id);
|
||||||
std::string idToString(db::DirectoryId id);
|
std::string idToString(db::DirectoryId id);
|
||||||
std::string idToString(db::MediaLibraryId id);
|
|
||||||
std::string idToString(db::ReleaseId id);
|
std::string idToString(db::ReleaseId id);
|
||||||
std::string idToString(db::TrackId id);
|
std::string idToString(db::TrackId id);
|
||||||
std::string idToString(db::TrackListId id);
|
std::string idToString(db::TrackListId id);
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ namespace lms::api::subsonic
|
|||||||
MediaLibrary::find(context.dbSession, [&](const MediaLibrary::pointer& library) {
|
MediaLibrary::find(context.dbSession, [&](const MediaLibrary::pointer& library) {
|
||||||
Response::Node& musicFolderNode{ musicFoldersNode.createArrayChild("musicFolder") };
|
Response::Node& musicFolderNode{ musicFoldersNode.createArrayChild("musicFolder") };
|
||||||
|
|
||||||
musicFolderNode.setAttribute("id", idToString(library->getId()));
|
musicFolderNode.setAttribute("id", library->getId().getValue());
|
||||||
musicFolderNode.setAttribute("name", library->getName());
|
musicFolderNode.setAttribute("name", library->getName());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ namespace lms::api::subsonic
|
|||||||
|
|
||||||
// users can access all libraries
|
// users can access all libraries
|
||||||
db::MediaLibrary::find(context.dbSession, [&](const db::MediaLibrary::pointer& library) {
|
db::MediaLibrary::find(context.dbSession, [&](const db::MediaLibrary::pointer& library) {
|
||||||
userNode.addArrayValue("folder", idToString(library->getId()));
|
userNode.addArrayValue("folder", library->getId().getValue());
|
||||||
});
|
});
|
||||||
|
|
||||||
return userNode;
|
return userNode;
|
||||||
|
|||||||
Reference in New Issue
Block a user