owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subsonic API: better compability with clients

Browse Source
This commit is contained in:
emeric
2021-09-24 12:37:54 +02:00
parent 5aa0e835cd
commit 828e2364a7
17 changed files with 405 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/subsonic/impl/SubsonicResponse.cpp
+11 -16
View File
@@ -29,6 +29,7 @@
#include "utils/Exception.hpp"
#include "utils/String.hpp"
#include "ProtocolVersion.hpp"
namespace API::Subsonic
{
@@ -102,26 +103,32 @@ Response::Node::createArrayChild(const std::string& key)
return _childrenArrays[key].back();
}
void
Response::Node::setVersionAttribute(ProtocolVersion protocolVersion)
{
setAttribute("version", std::to_string(protocolVersion.major) + "." + std::to_string(protocolVersion.minor) + "." + std::to_string(protocolVersion.patch));
}
Response
Response::createOkResponse(const RequestContext& context)
Response::createOkResponse(ProtocolVersion protocolVersion)
{
Response response;
Node& responseNode {response._root.createChild("subsonic-response")};
responseNode.setAttribute("status", "ok");
responseNode.setAttribute("version", std::string {QUOTEME(API_VERSION_MAJOR) "."} + std::to_string(getAPIMinorVersion(context.clientName)) + ".0");
responseNode.setVersionAttribute(protocolVersion);
return response;
}
Response
Response::createFailedResponse(std::string_view clientName, const Error& error)
Response::createFailedResponse(ProtocolVersion protocolVersion, const Error& error)
{
Response response;
Node& responseNode {response._root.createChild("subsonic-response")};
responseNode.setAttribute("status", "failed");
responseNode.setAttribute("version", std::string {QUOTEME(API_VERSION_MAJOR) "."} + std::to_string(getAPIMinorVersion(clientName)) + ".0");
responseNode.setVersionAttribute(protocolVersion);
Node& errorNode {responseNode.createChild("error")};
errorNode.setAttribute("code", std::to_string(static_cast<int>(error.getCode())));
@@ -214,18 +221,6 @@ Response::writeXML(std::ostream& os)
boost::property_tree::write_xml(os, root);
}
unsigned
Response::getAPIMinorVersion(std::string_view clientName)
{
// Some clients do not rely on version to enable the clear text password auth scheme
if (clientName == "Audinaut")
return 16;
else if (clientName == "Sublime Music")
return 16;
else
return 12;
}
void
Response::writeJSON(std::ostream& os)
{