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

Sort artists using sortname tag + search by name also in this tag. Fixes #44

Browse Source
This commit is contained in:
emeric
2020-04-04 15:34:26 +02:00
parent adf77a0842
commit 06f9673b28
5 changed files with 111 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/database/impl/Artist.cpp
+20 -9
View File
@@ -80,7 +80,7 @@ getQuery(Session& session,
const std::set<IdType>& clusterIds,
const std::vector<std::string>& keywords,
std::optional<TrackArtistLink::Type> linkType,
Artist::NameSortMethod sortMethod)
Artist::SortMethod sortMethod)
{
session.checkSharedLocked();
@@ -89,8 +89,19 @@ getQuery(Session& session,
std::ostringstream oss;
oss << "SELECT DISTINCT a FROM artist a";
for (auto keyword : keywords)
where.And(WhereClause("a.name LIKE ?")).bind("%%" + keyword + "%%");
if (!keywords.empty())
{
WhereClause whereKeywordsName;
WhereClause whereKeywordsSortName;
for (auto keyword : keywords)
{
whereKeywordsName.And(WhereClause("a.name LIKE ?")).bind("%%" + keyword + "%%");
whereKeywordsSortName.And(WhereClause("a.sort_name LIKE ?")).bind("%%" + keyword + "%%");
}
where.And(whereKeywordsName.Or(whereKeywordsSortName));
}
if (!clusterIds.empty() || linkType)
{
@@ -116,12 +127,12 @@ getQuery(Session& session,
switch (sortMethod)
{
case Artist::NameSortMethod::None:
case Artist::SortMethod::None:
break;
case Artist::NameSortMethod::ByName:
case Artist::SortMethod::ByName:
oss << " ORDER BY a.name COLLATE NOCASE";
break;
case Artist::NameSortMethod::BySortName:
case Artist::SortMethod::BySortName:
oss << " ORDER BY a.sort_name COLLATE NOCASE";
break;
}
@@ -137,7 +148,7 @@ getQuery(Session& session,
}
std::vector<Artist::pointer>
Artist::getAll(Session& session, NameSortMethod sortMethod, std::optional<std::size_t> offset, std::optional<std::size_t> size)
Artist::getAll(Session& session, SortMethod sortMethod, std::optional<std::size_t> offset, std::optional<std::size_t> size)
{
session.checkSharedLocked();
@@ -181,7 +192,7 @@ Artist::getAllIdsWithClusters(Session& session, std::optional<std::size_t> limit
}
std::vector<Artist::pointer>
Artist::getByClusters(Session& session, const std::set<IdType>& clusters, NameSortMethod sortMethod)
Artist::getByClusters(Session& session, const std::set<IdType>& clusters, SortMethod sortMethod)
{
assert(!clusters.empty());
@@ -195,7 +206,7 @@ Artist::getByFilter(Session& session,
const std::set<IdType>& clusters,
const std::vector<std::string>& keywords,
std::optional<TrackArtistLink::Type> linkType,
NameSortMethod sortMethod,
SortMethod sortMethod,
std::optional<std::size_t> offset,
std::optional<std::size_t> size,
bool& moreResults)
src/libs/database/include/database/Artist.hpp
+6 -6
View File
@@ -45,7 +45,7 @@ class Artist : public Wt::Dbo::Dbo<Artist>
{
public:
enum class NameSortMethod
enum class SortMethod
{
None,
ByName,
@@ -60,21 +60,21 @@ class Artist : public Wt::Dbo::Dbo<Artist>
// Accessors
static pointer getByMBID(Session& session, const UUID& MBID);
static pointer getById(Session& session, IdType id);
static std::vector<pointer> getByName(Session& session, const std::string& name);
static std::vector<pointer> getByName(Session& session, const std::string& name); // exact match on name field
static std::vector<pointer> getByClusters(Session& session,
const std::set<IdType>& clusters, // at least one track that belongs to these clusters
NameSortMethod sortMethod
SortMethod sortMethod
);
static std::vector<pointer> getByFilter(Session& session,
const std::set<IdType>& clusters, // if non empty, at least one artist that belongs to these clusters
const std::vector<std::string>& keywords, // if non empty, name must match all of these keywords
const std::vector<std::string>& keywords, // if non empty, name must match all of these keywords (name + sort name fields)
std::optional<TrackArtistLink::Type> linkType, // if set, only artists that have produced at least one track with this link type
NameSortMethod sortMethod,
SortMethod sortMethod,
std::optional<std::size_t> offset,
std::optional<std::size_t> size,
bool& moreExpected);
static std::vector<pointer> getAll(Session& session, NameSortMethod sortMethod, std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {});
static std::vector<pointer> getAll(Session& session, SortMethod sortMethod, std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {});
static std::vector<IdType> getAllIds(Session& session);
static std::vector<pointer> getAllOrphans(Session& session); // No track related
static std::vector<pointer> getLastAdded(Session& session, Wt::WDateTime after, std::optional<std::size_t> size = {});