Changed coding style

This commit is contained in:
emeric
2023-10-02 20:32:28 +02:00
parent 4fbacd691d
commit 7c7fbba319
18 changed files with 1265 additions and 1311 deletions
+75 -85
View File
@@ -26,114 +26,104 @@
namespace API::Subsonic
{
std::string
idToString(Database::ArtistId id)
{
return "ar-" + id.toString();
}
std::string idToString(Database::ArtistId id)
{
return "ar-" + id.toString();
}
std::string
idToString(Database::ReleaseId id)
{
return "al-" + id.toString();
}
std::string idToString(Database::ReleaseId id)
{
return "al-" + id.toString();
}
std::string
idToString(RootId)
{
return "root";
}
std::string idToString(RootId)
{
return "root";
}
std::string
idToString(Database::TrackId id)
{
return "tr-" + id.toString();
}
std::string idToString(Database::TrackId id)
{
return "tr-" + id.toString();
}
std::string
idToString(Database::TrackListId id)
{
return "pl-" + id.toString();
}
std::string idToString(Database::TrackListId id)
{
return "pl-" + id.toString();
}
} // namespace API::Subsonic
namespace StringUtils
{
template<>
std::optional<Database::ArtistId>
readAs(std::string_view str)
{
std::vector<std::string_view> values {StringUtils::splitString(str, "-")};
if (values.size() != 2)
return std::nullopt;
template<>
std::optional<Database::ArtistId> readAs(std::string_view str)
{
std::vector<std::string_view> values{ StringUtils::splitString(str, "-") };
if (values.size() != 2)
return std::nullopt;
if (values[0] != "ar")
return std::nullopt;
if (values[0] != "ar")
return std::nullopt;
if (const auto value {StringUtils::readAs<Database::ArtistId::ValueType>(values[1])})
return Database::ArtistId {*value};
if (const auto value{ StringUtils::readAs<Database::ArtistId::ValueType>(values[1]) })
return Database::ArtistId{ *value };
return std::nullopt;
}
return std::nullopt;
}
template<>
std::optional<Database::ReleaseId>
readAs(std::string_view str)
{
std::vector<std::string_view> values {StringUtils::splitString(str, "-")};
if (values.size() != 2)
return std::nullopt;
template<>
std::optional<Database::ReleaseId> readAs(std::string_view str)
{
std::vector<std::string_view> values{ StringUtils::splitString(str, "-") };
if (values.size() != 2)
return std::nullopt;
if (values[0] != "al")
return std::nullopt;
if (values[0] != "al")
return std::nullopt;
if (const auto value {StringUtils::readAs<Database::ReleaseId::ValueType>(values[1])})
return Database::ReleaseId {*value};
if (const auto value{ StringUtils::readAs<Database::ReleaseId::ValueType>(values[1]) })
return Database::ReleaseId{ *value };
return std::nullopt;
}
return std::nullopt;
}
template<>
std::optional<API::Subsonic::RootId>
readAs(std::string_view str)
{
if (str == "root")
return API::Subsonic::RootId {};
template<>
std::optional<API::Subsonic::RootId> readAs(std::string_view str)
{
if (str == "root")
return API::Subsonic::RootId{};
return std::nullopt;
}
return std::nullopt;
}
template<>
std::optional<Database::TrackId>
readAs(std::string_view str)
{
std::vector<std::string_view> values {StringUtils::splitString(str, "-")};
if (values.size() != 2)
return std::nullopt;
template<>
std::optional<Database::TrackId> readAs(std::string_view str)
{
std::vector<std::string_view> values{ StringUtils::splitString(str, "-") };
if (values.size() != 2)
return std::nullopt;
if (values[0] != "tr")
return std::nullopt;
if (values[0] != "tr")
return std::nullopt;
if (const auto value {StringUtils::readAs<Database::TrackId::ValueType>(values[1])})
return Database::TrackId {*value};
if (const auto value{ StringUtils::readAs<Database::TrackId::ValueType>(values[1]) })
return Database::TrackId{ *value };
return std::nullopt;
}
return std::nullopt;
}
template<>
std::optional<Database::TrackListId>
readAs(std::string_view str)
{
std::vector<std::string_view> values {StringUtils::splitString(str, "-")};
if (values.size() != 2)
return std::nullopt;
template<>
std::optional<Database::TrackListId> readAs(std::string_view str)
{
std::vector<std::string_view> values{ StringUtils::splitString(str, "-") };
if (values.size() != 2)
return std::nullopt;
if (values[0] != "pl")
return std::nullopt;
if (values[0] != "pl")
return std::nullopt;
if (const auto value {StringUtils::readAs<Database::TrackListId::ValueType>(values[1])})
return Database::TrackListId {*value};
if (const auto value{ StringUtils::readAs<Database::TrackListId::ValueType>(values[1]) })
return Database::TrackListId{ *value };
return std::nullopt;
}
return std::nullopt;
}
}