Subsonic API: added discTitles field in Albums
This commit is contained in:
emeric
@@ -35,448 +35,443 @@
|
|||||||
namespace Database
|
namespace Database
|
||||||
{
|
{
|
||||||
|
|
||||||
Wt::Dbo::Query<ReleaseId>
|
Wt::Dbo::Query<ReleaseId> createQuery(Session& session, const Release::FindParameters& params)
|
||||||
createQuery(Session& session, const Release::FindParameters& params)
|
{
|
||||||
{
|
auto query{ session.getDboSession().query<ReleaseId>("SELECT DISTINCT r.id from release r") };
|
||||||
auto query {session.getDboSession().query<ReleaseId>("SELECT DISTINCT r.id from release r")};
|
|
||||||
|
if (params.sortMethod == ReleaseSortMethod::LastWritten
|
||||||
if (params.sortMethod == ReleaseSortMethod::LastWritten
|
|| params.sortMethod == ReleaseSortMethod::Date
|
||||||
|| params.sortMethod == ReleaseSortMethod::Date
|
|| params.sortMethod == ReleaseSortMethod::OriginalDate
|
||||||
|| params.sortMethod == ReleaseSortMethod::OriginalDate
|
|| params.sortMethod == ReleaseSortMethod::OriginalDateDesc
|
||||||
|| params.sortMethod == ReleaseSortMethod::OriginalDateDesc
|
|| params.writtenAfter.isValid()
|
||||||
|| params.writtenAfter.isValid()
|
|| params.dateRange
|
||||||
|| params.dateRange
|
|| params.artist.isValid())
|
||||||
|| params.artist.isValid())
|
{
|
||||||
{
|
query.join("track t ON t.release_id = r.id");
|
||||||
query.join("track t ON t.release_id = r.id");
|
}
|
||||||
}
|
|
||||||
|
if (params.writtenAfter.isValid())
|
||||||
if (params.writtenAfter.isValid())
|
query.where("t.file_last_write > ?").bind(params.writtenAfter);
|
||||||
query.where("t.file_last_write > ?").bind(params.writtenAfter);
|
|
||||||
|
if (params.dateRange)
|
||||||
if (params.dateRange)
|
{
|
||||||
{
|
query.where("t.date >= ?").bind(params.dateRange->begin);
|
||||||
query.where("t.date >= ?").bind(params.dateRange->begin);
|
query.where("t.date <= ?").bind(params.dateRange->end);
|
||||||
query.where("t.date <= ?").bind(params.dateRange->end);
|
}
|
||||||
}
|
|
||||||
|
for (std::string_view keyword : params.keywords)
|
||||||
for (std::string_view keyword : params.keywords)
|
query.where("r.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%" + Utils::escapeLikeKeyword(keyword) + "%");
|
||||||
query.where("r.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%" + Utils::escapeLikeKeyword(keyword) + "%");
|
|
||||||
|
if (params.starringUser.isValid())
|
||||||
if (params.starringUser.isValid())
|
{
|
||||||
{
|
assert(params.scrobbler);
|
||||||
assert(params.scrobbler);
|
query.join("starred_release s_r ON s_r.release_id = r.id")
|
||||||
query.join("starred_release s_r ON s_r.release_id = r.id")
|
.where("s_r.user_id = ?").bind(params.starringUser)
|
||||||
.where("s_r.user_id = ?").bind(params.starringUser)
|
.where("s_r.scrobbler = ?").bind(*params.scrobbler)
|
||||||
.where("s_r.scrobbler = ?").bind(*params.scrobbler)
|
.where("s_r.scrobbling_state <> ?").bind(ScrobblingState::PendingRemove);
|
||||||
.where("s_r.scrobbling_state <> ?").bind(ScrobblingState::PendingRemove);
|
}
|
||||||
}
|
|
||||||
|
if (params.artist.isValid())
|
||||||
if (params.artist.isValid())
|
{
|
||||||
{
|
query.join("artist a ON a.id = t_a_l.artist_id")
|
||||||
query.join("artist a ON a.id = t_a_l.artist_id")
|
.join("track_artist_link t_a_l ON t_a_l.track_id = t.id")
|
||||||
.join("track_artist_link t_a_l ON t_a_l.track_id = t.id")
|
.where("a.id = ?").bind(params.artist);
|
||||||
.where("a.id = ?").bind(params.artist);
|
|
||||||
|
if (!params.trackArtistLinkTypes.empty())
|
||||||
if (!params.trackArtistLinkTypes.empty())
|
{
|
||||||
{
|
std::ostringstream oss;
|
||||||
std::ostringstream oss;
|
|
||||||
|
bool first{ true };
|
||||||
bool first {true};
|
for (TrackArtistLinkType linkType : params.trackArtistLinkTypes)
|
||||||
for (TrackArtistLinkType linkType : params.trackArtistLinkTypes)
|
{
|
||||||
{
|
if (!first)
|
||||||
if (!first)
|
oss << " OR ";
|
||||||
oss << " OR ";
|
oss << "t_a_l.type = ?";
|
||||||
oss << "t_a_l.type = ?";
|
query.bind(linkType);
|
||||||
query.bind(linkType);
|
|
||||||
|
first = false;
|
||||||
first = false;
|
}
|
||||||
}
|
query.where(oss.str());
|
||||||
query.where(oss.str());
|
}
|
||||||
}
|
|
||||||
|
if (!params.excludedTrackArtistLinkTypes.empty())
|
||||||
if (!params.excludedTrackArtistLinkTypes.empty())
|
{
|
||||||
{
|
std::ostringstream oss;
|
||||||
std::ostringstream oss;
|
oss << "r.id NOT IN (SELECT DISTINCT r.id FROM release r"
|
||||||
oss << "r.id NOT IN (SELECT DISTINCT r.id FROM release r"
|
" INNER JOIN artist a ON a.id = t_a_l.artist_id"
|
||||||
" INNER JOIN artist a ON a.id = t_a_l.artist_id"
|
" INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id"
|
||||||
" INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id"
|
" INNER JOIN track t ON t.release_id = r.id"
|
||||||
" INNER JOIN track t ON t.release_id = r.id"
|
" WHERE (a.id = ? AND (";
|
||||||
" WHERE (a.id = ? AND (";
|
|
||||||
|
query.bind(params.artist);
|
||||||
query.bind(params.artist);
|
|
||||||
|
bool first{ true };
|
||||||
bool first {true};
|
for (const TrackArtistLinkType linkType : params.excludedTrackArtistLinkTypes)
|
||||||
for (const TrackArtistLinkType linkType : params.excludedTrackArtistLinkTypes)
|
{
|
||||||
{
|
if (!first)
|
||||||
if (!first)
|
oss << " OR ";
|
||||||
oss << " OR ";
|
oss << "t_a_l.type = ?";
|
||||||
oss << "t_a_l.type = ?";
|
query.bind(linkType);
|
||||||
query.bind(linkType);
|
|
||||||
|
first = false;
|
||||||
first = false;
|
}
|
||||||
}
|
oss << ")))";
|
||||||
oss << ")))";
|
query.where(oss.str());
|
||||||
query.where(oss.str());
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
if (!params.clusters.empty())
|
||||||
if (!params.clusters.empty())
|
{
|
||||||
{
|
std::ostringstream oss;
|
||||||
std::ostringstream oss;
|
oss << "r.id IN (SELECT DISTINCT r.id FROM release r"
|
||||||
oss << "r.id IN (SELECT DISTINCT r.id FROM release r"
|
" INNER JOIN track t ON t.release_id = r.id"
|
||||||
" INNER JOIN track t ON t.release_id = r.id"
|
" INNER JOIN cluster c ON c.id = t_c.cluster_id"
|
||||||
" INNER JOIN cluster c ON c.id = t_c.cluster_id"
|
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id";
|
||||||
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id";
|
|
||||||
|
WhereClause clusterClause;
|
||||||
WhereClause clusterClause;
|
for (const ClusterId clusterId : params.clusters)
|
||||||
for (const ClusterId clusterId : params.clusters)
|
{
|
||||||
{
|
clusterClause.Or(WhereClause("c.id = ?"));
|
||||||
clusterClause.Or(WhereClause("c.id = ?"));
|
query.bind(clusterId);
|
||||||
query.bind(clusterId);
|
}
|
||||||
}
|
|
||||||
|
oss << " " << clusterClause.get();
|
||||||
oss << " " << clusterClause.get();
|
oss << " GROUP BY t.id HAVING COUNT(*) = " << params.clusters.size() << ")";
|
||||||
oss << " GROUP BY t.id HAVING COUNT(*) = " << params.clusters.size() << ")";
|
|
||||||
|
query.where(oss.str());
|
||||||
query.where(oss.str());
|
}
|
||||||
}
|
|
||||||
|
if (params.primaryType)
|
||||||
if (params.primaryType)
|
query.where("primary_type = ?").bind(*params.primaryType);
|
||||||
query.where("primary_type = ?").bind(*params.primaryType);
|
if (!params.secondaryTypes.empty())
|
||||||
if (!params.secondaryTypes.empty())
|
query.where("secondary_type = ?").bind(params.secondaryTypes);
|
||||||
query.where("secondary_type = ?").bind(params.secondaryTypes);
|
|
||||||
|
switch (params.sortMethod)
|
||||||
switch (params.sortMethod)
|
{
|
||||||
{
|
case ReleaseSortMethod::None:
|
||||||
case ReleaseSortMethod::None:
|
break;
|
||||||
break;
|
case ReleaseSortMethod::Name:
|
||||||
case ReleaseSortMethod::Name:
|
query.orderBy("r.name COLLATE NOCASE");
|
||||||
query.orderBy("r.name COLLATE NOCASE");
|
break;
|
||||||
break;
|
case ReleaseSortMethod::Random:
|
||||||
case ReleaseSortMethod::Random:
|
query.orderBy("RANDOM()");
|
||||||
query.orderBy("RANDOM()");
|
break;
|
||||||
break;
|
case ReleaseSortMethod::LastWritten:
|
||||||
case ReleaseSortMethod::LastWritten:
|
query.orderBy("t.file_last_write DESC");
|
||||||
query.orderBy("t.file_last_write DESC");
|
break;
|
||||||
break;
|
case ReleaseSortMethod::Date:
|
||||||
case ReleaseSortMethod::Date:
|
query.orderBy("t.date, r.name COLLATE NOCASE");
|
||||||
query.orderBy("t.date, r.name COLLATE NOCASE");
|
break;
|
||||||
break;
|
case ReleaseSortMethod::OriginalDate:
|
||||||
case ReleaseSortMethod::OriginalDate:
|
query.orderBy("CASE WHEN t.original_date IS NULL THEN t.date ELSE t.original_date END, t.date, r.name COLLATE NOCASE");
|
||||||
query.orderBy("CASE WHEN t.original_date IS NULL THEN t.date ELSE t.original_date END, t.date, r.name COLLATE NOCASE");
|
break;
|
||||||
break;
|
case ReleaseSortMethod::OriginalDateDesc:
|
||||||
case ReleaseSortMethod::OriginalDateDesc:
|
query.orderBy("CASE WHEN t.original_date IS NULL THEN t.date ELSE t.original_date END DESC, t.date, r.name COLLATE NOCASE");
|
||||||
query.orderBy("CASE WHEN t.original_date IS NULL THEN t.date ELSE t.original_date END DESC, t.date, r.name COLLATE NOCASE");
|
break;
|
||||||
break;
|
case ReleaseSortMethod::StarredDateDesc:
|
||||||
case ReleaseSortMethod::StarredDateDesc:
|
assert(params.starringUser.isValid());
|
||||||
assert(params.starringUser.isValid());
|
query.orderBy("s_r.date_time DESC");
|
||||||
query.orderBy("s_r.date_time DESC");
|
break;
|
||||||
break;
|
}
|
||||||
}
|
|
||||||
|
return query;
|
||||||
return query;
|
}
|
||||||
}
|
|
||||||
|
Release::Release(const std::string& name, const std::optional<UUID>& MBID)
|
||||||
Release::Release(const std::string& name, const std::optional<UUID>& MBID)
|
: _name{ std::string(name, 0 , _maxNameLength) },
|
||||||
: _name {std::string(name, 0 , _maxNameLength)},
|
_MBID{ MBID ? MBID->getAsString() : "" }
|
||||||
_MBID {MBID ? MBID->getAsString() : ""}
|
{
|
||||||
{
|
}
|
||||||
}
|
|
||||||
|
Release::pointer Release::create(Session& session, const std::string& name, const std::optional<UUID>& MBID)
|
||||||
Release::pointer
|
{
|
||||||
Release::create(Session& session, const std::string& name, const std::optional<UUID>& MBID)
|
return session.getDboSession().add(std::unique_ptr<Release> {new Release{ name, MBID }});
|
||||||
{
|
}
|
||||||
return session.getDboSession().add(std::unique_ptr<Release> {new Release {name, MBID}});
|
|
||||||
}
|
std::vector<Release::pointer> Release::find(Session& session, const std::string& name)
|
||||||
|
{
|
||||||
std::vector<Release::pointer>
|
session.checkUniqueLocked();
|
||||||
Release::find(Session& session, const std::string& name)
|
|
||||||
{
|
auto res{ session.getDboSession()
|
||||||
session.checkUniqueLocked();
|
.find<Release>()
|
||||||
|
.where("name = ?").bind(std::string(name, 0, _maxNameLength))
|
||||||
auto res {session.getDboSession()
|
.resultList() };
|
||||||
.find<Release>()
|
|
||||||
.where("name = ?").bind( std::string(name, 0, _maxNameLength) )
|
return std::vector<Release::pointer>(res.begin(), res.end());
|
||||||
.resultList()};
|
}
|
||||||
|
|
||||||
return std::vector<Release::pointer>(res.begin(), res.end());
|
Release::pointer Release::find(Session& session, const UUID& mbid)
|
||||||
}
|
{
|
||||||
|
session.checkSharedLocked();
|
||||||
Release::pointer
|
|
||||||
Release::find(Session& session, const UUID& mbid)
|
return session.getDboSession()
|
||||||
{
|
.find<Release>()
|
||||||
session.checkSharedLocked();
|
.where("mbid = ?").bind(std::string{ mbid.getAsString() })
|
||||||
|
.resultValue();;
|
||||||
return session.getDboSession()
|
}
|
||||||
.find<Release>()
|
|
||||||
.where("mbid = ?").bind(std::string {mbid.getAsString()})
|
Release::pointer Release::find(Session& session, ReleaseId id)
|
||||||
.resultValue();;
|
{
|
||||||
}
|
session.checkSharedLocked();
|
||||||
|
|
||||||
Release::pointer
|
return session.getDboSession()
|
||||||
Release::find(Session& session, ReleaseId id)
|
.find<Release>()
|
||||||
{
|
.where("id = ?").bind(id)
|
||||||
session.checkSharedLocked();
|
.resultValue();
|
||||||
|
}
|
||||||
return session.getDboSession()
|
|
||||||
.find<Release>()
|
bool Release::exists(Session& session, ReleaseId id)
|
||||||
.where("id = ?").bind(id)
|
{
|
||||||
.resultValue();
|
session.checkSharedLocked();
|
||||||
}
|
return session.getDboSession().query<int>("SELECT 1 FROM release").where("id = ?").bind(id).resultValue() == 1;
|
||||||
|
}
|
||||||
bool
|
|
||||||
Release::exists(Session& session, ReleaseId id)
|
std::size_t Release::getCount(Session& session)
|
||||||
{
|
{
|
||||||
session.checkSharedLocked();
|
session.checkSharedLocked();
|
||||||
return session.getDboSession().query<int>("SELECT 1 FROM release").where("id = ?").bind(id).resultValue() == 1;
|
|
||||||
}
|
return session.getDboSession().query<int>("SELECT COUNT(*) FROM release");
|
||||||
|
}
|
||||||
std::size_t
|
|
||||||
Release::getCount(Session& session)
|
RangeResults<ReleaseId> Release::findOrderedByArtist(Session& session, Range range)
|
||||||
{
|
{
|
||||||
session.checkSharedLocked();
|
session.checkSharedLocked();
|
||||||
|
|
||||||
return session.getDboSession().query<int>("SELECT COUNT(*) FROM release");
|
// TODO merge with find
|
||||||
}
|
auto query{ session.getDboSession().query<ReleaseId>(
|
||||||
|
"SELECT DISTINCT r.id FROM release r"
|
||||||
RangeResults<ReleaseId>
|
" INNER JOIN track t ON r.id = t.release_id"
|
||||||
Release::findOrderedByArtist(Session& session, Range range)
|
" INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id"
|
||||||
{
|
" INNER JOIN artist a ON t_a_l.artist_id = a.id")
|
||||||
session.checkSharedLocked();
|
.orderBy("a.name COLLATE NOCASE, r.name COLLATE NOCASE") };
|
||||||
|
|
||||||
// TODO merge with find
|
return Utils::execQuery(query, range);
|
||||||
auto query {session.getDboSession().query<ReleaseId>(
|
}
|
||||||
"SELECT DISTINCT r.id FROM release r"
|
|
||||||
" INNER JOIN track t ON r.id = t.release_id"
|
RangeResults<ReleaseId> Release::findOrphans(Session& session, Range range)
|
||||||
" INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id"
|
{
|
||||||
" INNER JOIN artist a ON t_a_l.artist_id = a.id")
|
session.checkSharedLocked();
|
||||||
.orderBy("a.name COLLATE NOCASE, r.name COLLATE NOCASE")};
|
|
||||||
|
auto query{ session.getDboSession().query<ReleaseId>("select r.id from release r LEFT OUTER JOIN Track t ON r.id = t.release_id WHERE t.id IS NULL") };
|
||||||
return Utils::execQuery(query, range);
|
return Utils::execQuery(query, range);
|
||||||
}
|
}
|
||||||
|
|
||||||
RangeResults<ReleaseId>
|
RangeResults<ReleaseId> Release::find(Session& session, const FindParameters& params)
|
||||||
Release::findOrphans(Session& session, Range range)
|
{
|
||||||
{
|
session.checkSharedLocked();
|
||||||
session.checkSharedLocked();
|
|
||||||
|
auto query{ createQuery(session, params) };
|
||||||
auto query {session.getDboSession().query<ReleaseId>("select r.id from release r LEFT OUTER JOIN Track t ON r.id = t.release_id WHERE t.id IS NULL")};
|
|
||||||
return Utils::execQuery(query, range);
|
return Utils::execQuery(query, params.range);
|
||||||
}
|
}
|
||||||
|
|
||||||
RangeResults<ReleaseId>
|
std::size_t Release::getDiscCount() const
|
||||||
Release::find(Session& session, const FindParameters& params)
|
{
|
||||||
{
|
assert(session());
|
||||||
session.checkSharedLocked();
|
int res{ session()->query<int>("SELECT COUNT(DISTINCT disc_number) FROM track t")
|
||||||
|
.join("release r ON r.id = t.release_id")
|
||||||
auto query {createQuery(session, params)};
|
.where("r.id = ?")
|
||||||
|
.bind(getId()) };
|
||||||
return Utils::execQuery(query, params.range);
|
|
||||||
}
|
return res;
|
||||||
|
}
|
||||||
std::size_t
|
|
||||||
Release::getDiscCount() const
|
std::vector<DiscInfo> Release::getDiscs() const
|
||||||
{
|
{
|
||||||
assert(session());
|
assert(session());
|
||||||
int res {session()->query<int>("SELECT COUNT(DISTINCT disc_number) FROM track t")
|
using ResultType = std::tuple<int, std::string>;
|
||||||
.join("release r ON r.id = t.release_id")
|
auto results{ session()->query<ResultType>("SELECT DISTINCT disc_number, disc_subtitle FROM track t")
|
||||||
.where("r.id = ?")
|
.join("release r ON r.id = t.release_id")
|
||||||
.bind(getId())};
|
.where("r.id = ?")
|
||||||
|
.orderBy("disc_number")
|
||||||
return res;
|
.bind(getId())
|
||||||
}
|
.resultList() };
|
||||||
|
|
||||||
Wt::WDate
|
std::vector<DiscInfo> discs;
|
||||||
Release::getReleaseDate() const
|
for (const auto& res : results)
|
||||||
{
|
discs.emplace_back(DiscInfo{ static_cast<std::size_t>(std::get<int>(res)), std::get<std::string>(res) });
|
||||||
return getReleaseDate(false);
|
|
||||||
}
|
return discs;
|
||||||
|
}
|
||||||
Wt::WDate
|
|
||||||
Release::getOriginalReleaseDate() const
|
Wt::WDate Release::getReleaseDate() const
|
||||||
{
|
{
|
||||||
return getReleaseDate(true);
|
return getReleaseDate(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
Wt::WDate
|
Wt::WDate Release::getOriginalReleaseDate() const
|
||||||
Release::getReleaseDate(bool original) const
|
{
|
||||||
{
|
return getReleaseDate(true);
|
||||||
assert(session());
|
}
|
||||||
|
|
||||||
const char* field {original ? "original_date" : "date"};
|
Wt::WDate Release::getReleaseDate(bool original) const
|
||||||
|
{
|
||||||
auto dates {session()->query<Wt::WDate>(
|
assert(session());
|
||||||
std::string {"SELECT "} + "t." + field + " FROM track t INNER JOIN release r ON r.id = t.release_id")
|
|
||||||
.where("r.id = ?")
|
const char* field{ original ? "original_date" : "date" };
|
||||||
.groupBy(field)
|
|
||||||
.bind(getId())
|
auto dates{ session()->query<Wt::WDate>(
|
||||||
.resultList()};
|
std::string {"SELECT "} + "t." + field + " FROM track t INNER JOIN release r ON r.id = t.release_id")
|
||||||
|
.where("r.id = ?")
|
||||||
// various dates => invalid date
|
.groupBy(field)
|
||||||
if (dates.empty() || dates.size() > 1)
|
.bind(getId())
|
||||||
return {};
|
.resultList() };
|
||||||
|
|
||||||
return dates.front();
|
// various dates => invalid date
|
||||||
}
|
if (dates.empty() || dates.size() > 1)
|
||||||
|
return {};
|
||||||
std::optional<std::string>
|
|
||||||
Release::getCopyright() const
|
return dates.front();
|
||||||
{
|
}
|
||||||
assert(session());
|
|
||||||
|
std::optional<std::string> Release::getCopyright() const
|
||||||
Wt::Dbo::collection<std::string> copyrights = session()->query<std::string>
|
{
|
||||||
("SELECT copyright FROM track t INNER JOIN release r ON r.id = t.release_id")
|
assert(session());
|
||||||
.where("r.id = ?")
|
|
||||||
.groupBy("copyright")
|
Wt::Dbo::collection<std::string> copyrights = session()->query<std::string>
|
||||||
.bind(getId());
|
("SELECT copyright FROM track t INNER JOIN release r ON r.id = t.release_id")
|
||||||
|
.where("r.id = ?")
|
||||||
std::vector<std::string> values(copyrights.begin(), copyrights.end());
|
.groupBy("copyright")
|
||||||
|
.bind(getId());
|
||||||
// various copyrights => no copyright
|
|
||||||
if (values.empty() || values.size() > 1 || values.front().empty())
|
std::vector<std::string> values(copyrights.begin(), copyrights.end());
|
||||||
return std::nullopt;
|
|
||||||
|
// various copyrights => no copyright
|
||||||
return values.front();
|
if (values.empty() || values.size() > 1 || values.front().empty())
|
||||||
}
|
return std::nullopt;
|
||||||
|
|
||||||
std::optional<std::string>
|
return values.front();
|
||||||
Release::getCopyrightURL() const
|
}
|
||||||
{
|
|
||||||
assert(session());
|
std::optional<std::string> Release::getCopyrightURL() const
|
||||||
|
{
|
||||||
Wt::Dbo::collection<std::string> copyrights = session()->query<std::string>
|
assert(session());
|
||||||
("SELECT copyright_url FROM track t INNER JOIN release r ON r.id = t.release_id")
|
|
||||||
.where("r.id = ?")
|
Wt::Dbo::collection<std::string> copyrights = session()->query<std::string>
|
||||||
.groupBy("copyright_url")
|
("SELECT copyright_url FROM track t INNER JOIN release r ON r.id = t.release_id")
|
||||||
.bind(getId());
|
.where("r.id = ?")
|
||||||
|
.groupBy("copyright_url")
|
||||||
std::vector<std::string> values(copyrights.begin(), copyrights.end());
|
.bind(getId());
|
||||||
|
|
||||||
// various copyright URLs => no copyright URL
|
std::vector<std::string> values(copyrights.begin(), copyrights.end());
|
||||||
if (values.empty() || values.size() > 1 || values.front().empty())
|
|
||||||
return std::nullopt;
|
// various copyright URLs => no copyright URL
|
||||||
|
if (values.empty() || values.size() > 1 || values.front().empty())
|
||||||
return values.front();
|
return std::nullopt;
|
||||||
}
|
|
||||||
|
return values.front();
|
||||||
std::vector<Artist::pointer>
|
}
|
||||||
Release::getArtists(TrackArtistLinkType linkType) const
|
|
||||||
{
|
std::vector<Artist::pointer> Release::getArtists(TrackArtistLinkType linkType) const
|
||||||
assert(session());
|
{
|
||||||
|
assert(session());
|
||||||
auto res {session()->query<Wt::Dbo::ptr<Artist>>(
|
|
||||||
"SELECT DISTINCT a FROM artist a"
|
auto res{ session()->query<Wt::Dbo::ptr<Artist>>(
|
||||||
" INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id"
|
"SELECT DISTINCT a FROM artist a"
|
||||||
" INNER JOIN track t ON t.id = t_a_l.track_id"
|
" INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id"
|
||||||
" INNER JOIN release r ON r.id = t.release_id")
|
" INNER JOIN track t ON t.id = t_a_l.track_id"
|
||||||
.where("r.id = ?").bind(getId())
|
" INNER JOIN release r ON r.id = t.release_id")
|
||||||
.where("t_a_l.type = ?").bind(linkType)
|
.where("r.id = ?").bind(getId())
|
||||||
.resultList()};
|
.where("t_a_l.type = ?").bind(linkType)
|
||||||
|
.resultList() };
|
||||||
return std::vector<Artist::pointer>(res.begin(), res.end());
|
|
||||||
}
|
return std::vector<Artist::pointer>(res.begin(), res.end());
|
||||||
|
}
|
||||||
std::vector<Release::pointer>
|
|
||||||
Release::getSimilarReleases(std::optional<std::size_t> offset, std::optional<std::size_t> count) const
|
std::vector<Release::pointer> Release::getSimilarReleases(std::optional<std::size_t> offset, std::optional<std::size_t> count) const
|
||||||
{
|
{
|
||||||
assert(session());
|
assert(session());
|
||||||
|
|
||||||
auto res {session()->query<Wt::Dbo::ptr<Release>>(
|
auto res{ session()->query<Wt::Dbo::ptr<Release>>(
|
||||||
"SELECT r FROM release r"
|
"SELECT r FROM release r"
|
||||||
" INNER JOIN track t ON t.release_id = r.id"
|
" INNER JOIN track t ON t.release_id = r.id"
|
||||||
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"
|
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"
|
||||||
" WHERE "
|
" WHERE "
|
||||||
" t_c.cluster_id IN (SELECT c.id from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON r.id = t.release_id WHERE r.id = ?)"
|
" t_c.cluster_id IN (SELECT c.id from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON r.id = t.release_id WHERE r.id = ?)"
|
||||||
" AND r.id <> ?"
|
" AND r.id <> ?"
|
||||||
)
|
)
|
||||||
.bind(getId())
|
.bind(getId())
|
||||||
.bind(getId())
|
.bind(getId())
|
||||||
.groupBy("r.id")
|
.groupBy("r.id")
|
||||||
.orderBy("COUNT(*) DESC, RANDOM()")
|
.orderBy("COUNT(*) DESC, RANDOM()")
|
||||||
.limit(count ? static_cast<int>(*count) : -1)
|
.limit(count ? static_cast<int>(*count) : -1)
|
||||||
.offset(offset ? static_cast<int>(*offset) : -1)
|
.offset(offset ? static_cast<int>(*offset) : -1)
|
||||||
.resultList()};
|
.resultList() };
|
||||||
|
|
||||||
return std::vector<pointer>(res.begin(), res.end());
|
return std::vector<pointer>(res.begin(), res.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool Release::hasVariousArtists() const
|
||||||
Release::hasVariousArtists() const
|
{
|
||||||
{
|
// TODO optimize
|
||||||
// TODO optimize
|
return getArtists().size() > 1;
|
||||||
return getArtists().size() > 1;
|
}
|
||||||
}
|
|
||||||
|
std::size_t Release::getTracksCount() const
|
||||||
std::size_t
|
{
|
||||||
Release::getTracksCount() const
|
return _tracks.size();
|
||||||
{
|
}
|
||||||
return _tracks.size();
|
|
||||||
}
|
std::chrono::milliseconds Release::getDuration() const
|
||||||
|
{
|
||||||
std::chrono::milliseconds
|
assert(session());
|
||||||
Release::getDuration() const
|
|
||||||
{
|
using milli = std::chrono::duration<int, std::milli>;
|
||||||
assert(session());
|
|
||||||
|
Wt::Dbo::Query<milli> query{ session()->query<milli>("SELECT COALESCE(SUM(duration), 0) FROM track t INNER JOIN release r ON t.release_id = r.id")
|
||||||
using milli = std::chrono::duration<int, std::milli>;
|
.where("r.id = ?").bind(getId()) };
|
||||||
|
|
||||||
Wt::Dbo::Query<milli> query {session()->query<milli>("SELECT COALESCE(SUM(duration), 0) FROM track t INNER JOIN release r ON t.release_id = r.id")
|
return query.resultValue();
|
||||||
.where("r.id = ?").bind(getId())};
|
}
|
||||||
|
|
||||||
return query.resultValue();
|
Wt::WDateTime Release::getLastWritten() const
|
||||||
}
|
{
|
||||||
|
assert(session());
|
||||||
Wt::WDateTime
|
|
||||||
Release::getLastWritten() const
|
Wt::Dbo::Query<Wt::WDateTime> query{ session()->query<Wt::WDateTime>("SELECT COALESCE(MAX(file_last_write), '1970-01-01T00:00:00') FROM track t INNER JOIN release r ON t.release_id = r.id")
|
||||||
{
|
.where("r.id = ?").bind(getId()) };
|
||||||
assert(session());
|
|
||||||
|
return query.resultValue();
|
||||||
Wt::Dbo::Query<Wt::WDateTime> query {session()->query<Wt::WDateTime>("SELECT COALESCE(MAX(file_last_write), '1970-01-01T00:00:00') FROM track t INNER JOIN release r ON t.release_id = r.id")
|
}
|
||||||
.where("r.id = ?").bind(getId())};
|
|
||||||
|
std::vector<std::vector<Cluster::pointer>> Release::getClusterGroups(const std::vector<ClusterType::pointer>& clusterTypes, std::size_t size) const
|
||||||
return query.resultValue();
|
{
|
||||||
}
|
assert(session());
|
||||||
|
|
||||||
std::vector<std::vector<Cluster::pointer>>
|
WhereClause where;
|
||||||
Release::getClusterGroups(const std::vector<ClusterType::pointer>& clusterTypes, std::size_t size) const
|
|
||||||
{
|
std::ostringstream oss;
|
||||||
assert(session());
|
|
||||||
|
oss << "SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN cluster_type c_type ON c.cluster_type_id = c_type.id INNER JOIN release r ON t.release_id = r.id ";
|
||||||
WhereClause where;
|
|
||||||
|
where.And(WhereClause("r.id = ?")).bind(getId().toString());
|
||||||
std::ostringstream oss;
|
{
|
||||||
|
WhereClause clusterClause;
|
||||||
oss << "SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN cluster_type c_type ON c.cluster_type_id = c_type.id INNER JOIN release r ON t.release_id = r.id ";
|
for (auto clusterType : clusterTypes)
|
||||||
|
clusterClause.Or(WhereClause("c_type.id = ?")).bind(clusterType->getId().toString());
|
||||||
where.And(WhereClause("r.id = ?")).bind(getId().toString());
|
where.And(clusterClause);
|
||||||
{
|
}
|
||||||
WhereClause clusterClause;
|
oss << " " << where.get();
|
||||||
for (auto clusterType : clusterTypes)
|
oss << " GROUP BY c.id ORDER BY COUNT(c.id) DESC";
|
||||||
clusterClause.Or(WhereClause("c_type.id = ?")).bind(clusterType->getId().toString());
|
|
||||||
where.And(clusterClause);
|
auto query{ session()->query<Wt::Dbo::ptr<Cluster>>(oss.str()) };
|
||||||
}
|
for (const std::string& bindArg : where.getBindArgs())
|
||||||
oss << " " << where.get();
|
query.bind(bindArg);
|
||||||
oss << " GROUP BY c.id ORDER BY COUNT(c.id) DESC";
|
|
||||||
|
auto queryRes{ query.resultList() };
|
||||||
auto query {session()->query<Wt::Dbo::ptr<Cluster>>(oss.str())};
|
|
||||||
for (const std::string& bindArg : where.getBindArgs())
|
std::map<ClusterTypeId, std::vector<Cluster::pointer>> clustersByType;
|
||||||
query.bind(bindArg);
|
for (const Wt::Dbo::ptr<Cluster>& cluster : queryRes)
|
||||||
|
{
|
||||||
auto queryRes {query.resultList()};
|
if (clustersByType[cluster->getType()->getId()].size() < size)
|
||||||
|
clustersByType[cluster->getType()->getId()].push_back(cluster);
|
||||||
std::map<ClusterTypeId, std::vector<Cluster::pointer>> clustersByType;
|
}
|
||||||
for (const Wt::Dbo::ptr<Cluster>& cluster : queryRes)
|
|
||||||
{
|
std::vector<std::vector<Cluster::pointer>> res;
|
||||||
if (clustersByType[cluster->getType()->getId()].size() < size)
|
for (const auto& [clusterTypeId, clusters] : clustersByType)
|
||||||
clustersByType[cluster->getType()->getId()].push_back(cluster);
|
res.push_back(clusters);
|
||||||
}
|
|
||||||
|
return res;
|
||||||
std::vector<std::vector<Cluster::pointer>> res;
|
}
|
||||||
for (const auto& [clusterTypeId, clusters] : clustersByType)
|
|
||||||
res.push_back(clusters);
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Database
|
} // namespace Database
|
||||||
|
|||||||
@@ -37,127 +37,127 @@
|
|||||||
namespace Database
|
namespace Database
|
||||||
{
|
{
|
||||||
|
|
||||||
class Artist;
|
class Artist;
|
||||||
class Cluster;
|
class Cluster;
|
||||||
class ClusterType;
|
class ClusterType;
|
||||||
class Release;
|
class Release;
|
||||||
class Session;
|
class Session;
|
||||||
class Track;
|
class Track;
|
||||||
class User;
|
class User;
|
||||||
|
|
||||||
class Release final : public Object<Release, ReleaseId>
|
class Release final : public Object<Release, ReleaseId>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
struct FindParameters
|
struct FindParameters
|
||||||
{
|
{
|
||||||
std::vector<ClusterId> clusters; // if non empty, releases that belong to these clusters
|
std::vector<ClusterId> clusters; // if non empty, releases that belong to these clusters
|
||||||
std::vector<std::string_view> keywords; // if non empty, name must match all of these keywords
|
std::vector<std::string_view> keywords; // if non empty, name must match all of these keywords
|
||||||
ReleaseSortMethod sortMethod {ReleaseSortMethod::None};
|
ReleaseSortMethod sortMethod{ ReleaseSortMethod::None };
|
||||||
Range range;
|
Range range;
|
||||||
Wt::WDateTime writtenAfter;
|
Wt::WDateTime writtenAfter;
|
||||||
std::optional<DateRange> dateRange;
|
std::optional<DateRange> dateRange;
|
||||||
UserId starringUser; // only releases starred by this user
|
UserId starringUser; // only releases starred by this user
|
||||||
std::optional<Scrobbler> scrobbler; // and for this scrobbler
|
std::optional<Scrobbler> scrobbler; // and for this scrobbler
|
||||||
ArtistId artist; // only releases that involved this user
|
ArtistId artist; // only releases that involved this user
|
||||||
EnumSet<TrackArtistLinkType> trackArtistLinkTypes; // and for these link types
|
EnumSet<TrackArtistLinkType> trackArtistLinkTypes; // and for these link types
|
||||||
EnumSet<TrackArtistLinkType> excludedTrackArtistLinkTypes; // but not for these link types
|
EnumSet<TrackArtistLinkType> excludedTrackArtistLinkTypes; // but not for these link types
|
||||||
std::optional<ReleaseTypePrimary> primaryType; // if, set, matching this primary type
|
std::optional<ReleaseTypePrimary> primaryType; // if, set, matching this primary type
|
||||||
EnumSet<ReleaseTypeSecondary> secondaryTypes; // Matching all this (if any)
|
EnumSet<ReleaseTypeSecondary> secondaryTypes; // Matching all this (if any)
|
||||||
|
|
||||||
FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; }
|
FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; }
|
||||||
FindParameters& setKeywords(const std::vector<std::string_view>& _keywords) { keywords = _keywords; return *this; }
|
FindParameters& setKeywords(const std::vector<std::string_view>& _keywords) { keywords = _keywords; return *this; }
|
||||||
FindParameters& setSortMethod(ReleaseSortMethod _sortMethod) {sortMethod = _sortMethod; return *this; }
|
FindParameters& setSortMethod(ReleaseSortMethod _sortMethod) { sortMethod = _sortMethod; return *this; }
|
||||||
FindParameters& setRange(Range _range) {range = _range; return *this; }
|
FindParameters& setRange(Range _range) { range = _range; return *this; }
|
||||||
FindParameters& setWrittenAfter(const Wt::WDateTime& _after) {writtenAfter = _after; return *this; }
|
FindParameters& setWrittenAfter(const Wt::WDateTime& _after) { writtenAfter = _after; return *this; }
|
||||||
FindParameters& setDateRange(const std::optional<DateRange>& _dateRange) {dateRange = _dateRange; return *this; }
|
FindParameters& setDateRange(const std::optional<DateRange>& _dateRange) { dateRange = _dateRange; return *this; }
|
||||||
FindParameters& setStarringUser(UserId _user, Scrobbler _scrobbler) { starringUser = _user; scrobbler = _scrobbler; return *this; }
|
FindParameters& setStarringUser(UserId _user, Scrobbler _scrobbler) { starringUser = _user; scrobbler = _scrobbler; return *this; }
|
||||||
FindParameters& setArtist(ArtistId _artist, EnumSet<TrackArtistLinkType> _trackArtistLinkTypes = {}, EnumSet<TrackArtistLinkType> _excludedTrackArtistLinkTypes = {})
|
FindParameters& setArtist(ArtistId _artist, EnumSet<TrackArtistLinkType> _trackArtistLinkTypes = {}, EnumSet<TrackArtistLinkType> _excludedTrackArtistLinkTypes = {})
|
||||||
{
|
{
|
||||||
artist = _artist;
|
artist = _artist;
|
||||||
trackArtistLinkTypes = _trackArtistLinkTypes;
|
trackArtistLinkTypes = _trackArtistLinkTypes;
|
||||||
excludedTrackArtistLinkTypes = _excludedTrackArtistLinkTypes;
|
excludedTrackArtistLinkTypes = _excludedTrackArtistLinkTypes;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Release() = default;
|
Release() = default;
|
||||||
|
|
||||||
// Accessors
|
// Accessors
|
||||||
static std::size_t getCount(Session& session);
|
static std::size_t getCount(Session& session);
|
||||||
static bool exists(Session& session, ReleaseId id);
|
static bool exists(Session& session, ReleaseId id);
|
||||||
static pointer find(Session& session, const UUID& MBID);
|
static pointer find(Session& session, const UUID& MBID);
|
||||||
static std::vector<pointer> find(Session& session, const std::string& name);
|
static std::vector<pointer> find(Session& session, const std::string& name);
|
||||||
static pointer find(Session& session, ReleaseId id);
|
static pointer find(Session& session, ReleaseId id);
|
||||||
static RangeResults<ReleaseId> find(Session& session, const FindParameters& parameters);
|
static RangeResults<ReleaseId> find(Session& session, const FindParameters& parameters);
|
||||||
static RangeResults<ReleaseId> findOrphans(Session& session, Range range); // no track related
|
static RangeResults<ReleaseId> findOrphans(Session& session, Range range); // no track related
|
||||||
static RangeResults<ReleaseId> findOrderedByArtist(Session& session, Range range);
|
static RangeResults<ReleaseId> findOrderedByArtist(Session& session, Range range);
|
||||||
|
|
||||||
std::size_t getTracksCount() const;
|
// Get the cluster of the tracks that belong to this release
|
||||||
|
// Each clusters are grouped by cluster type, sorted by the number of occurence (max to min)
|
||||||
|
// size is the max number of cluster per cluster type
|
||||||
|
std::vector<std::vector<ObjectPtr<Cluster>>> getClusterGroups(const std::vector<ObjectPtr<ClusterType>>& clusterTypes, std::size_t size) const;
|
||||||
|
|
||||||
// Get the cluster of the tracks that belong to this release
|
// Utility functions (if all tracks have the same values, which is legit to not be the case)
|
||||||
// Each clusters are grouped by cluster type, sorted by the number of occurence (max to min)
|
Wt::WDate getReleaseDate() const;
|
||||||
// size is the max number of cluster per cluster type
|
Wt::WDate getOriginalReleaseDate() const;
|
||||||
std::vector<std::vector<ObjectPtr<Cluster>>> getClusterGroups(const std::vector<ObjectPtr<ClusterType>>& clusterTypes, std::size_t size) const;
|
std::optional<std::string> getCopyright() const;
|
||||||
|
std::optional<std::string> getCopyrightURL() const;
|
||||||
|
|
||||||
// Utility functions (if all tracks have the same values, which is legit to not be the case)
|
// Accessors
|
||||||
Wt::WDate getReleaseDate() const;
|
const std::string& getName() const { return _name; }
|
||||||
Wt::WDate getOriginalReleaseDate() const;
|
std::optional<UUID> getMBID() const { return UUID::fromString(_MBID); }
|
||||||
std::optional<std::string> getCopyright() const;
|
std::optional<std::size_t> getTotalDisc() const { return _totalDisc; }
|
||||||
std::optional<std::string> getCopyrightURL() const;
|
std::size_t getDiscCount() const; // may not be total disc (if incomplete for example)
|
||||||
|
std::vector<DiscInfo> getDiscs() const;
|
||||||
|
std::chrono::milliseconds getDuration() const;
|
||||||
|
Wt::WDateTime getLastWritten() const;
|
||||||
|
std::optional<ReleaseTypePrimary> getPrimaryType() const { return _primaryType; }
|
||||||
|
EnumSet<ReleaseTypeSecondary> getSecondaryTypes() const { return _secondaryTypes; }
|
||||||
|
std::size_t getTracksCount() const;
|
||||||
|
|
||||||
// Accessors
|
// Setters
|
||||||
const std::string& getName() const { return _name; }
|
void setName(std::string_view name) { _name = name; }
|
||||||
std::optional<UUID> getMBID() const { return UUID::fromString(_MBID); }
|
void setMBID(const std::optional<UUID>& mbid) { _MBID = mbid ? mbid->getAsString() : ""; }
|
||||||
std::optional<std::size_t> getTotalDisc() const { return _totalDisc; }
|
void setTotalDisc(std::optional<int> totalDisc) { _totalDisc = totalDisc; }
|
||||||
std::size_t getDiscCount() const; // may not be total disc (if incomplete for example)
|
void setPrimaryType(std::optional<ReleaseTypePrimary> type) { _primaryType = type; }
|
||||||
std::chrono::milliseconds getDuration() const;
|
void setSecondaryTypes(EnumSet<ReleaseTypeSecondary> types) { _secondaryTypes = types; }
|
||||||
Wt::WDateTime getLastWritten() const;
|
|
||||||
std::optional<ReleaseTypePrimary> getPrimaryType() const { return _primaryType; }
|
|
||||||
EnumSet<ReleaseTypeSecondary> getSecondaryTypes() const { return _secondaryTypes; }
|
|
||||||
|
|
||||||
// Setters
|
// Get the artists of this release
|
||||||
void setName(std::string_view name) { _name = name; }
|
std::vector<ObjectPtr<Artist>> getArtists(TrackArtistLinkType type = TrackArtistLinkType::Artist) const;
|
||||||
void setMBID(const std::optional<UUID>& mbid) { _MBID = mbid ? mbid->getAsString() : ""; }
|
std::vector<ObjectPtr<Artist>> getReleaseArtists() const { return getArtists(TrackArtistLinkType::ReleaseArtist); }
|
||||||
void setTotalDisc(std::optional<int> totalDisc) { _totalDisc = totalDisc; }
|
bool hasVariousArtists() const;
|
||||||
void setPrimaryType(std::optional<ReleaseTypePrimary> type) { _primaryType = type; }
|
std::vector<pointer> getSimilarReleases(std::optional<std::size_t> offset = {}, std::optional<std::size_t> count = {}) const;
|
||||||
void setSecondaryTypes(EnumSet<ReleaseTypeSecondary> types) { _secondaryTypes = types; }
|
|
||||||
|
|
||||||
// Get the artists of this release
|
|
||||||
std::vector<ObjectPtr<Artist>> getArtists(TrackArtistLinkType type = TrackArtistLinkType::Artist) const;
|
|
||||||
std::vector<ObjectPtr<Artist>> getReleaseArtists() const { return getArtists(TrackArtistLinkType::ReleaseArtist); }
|
|
||||||
bool hasVariousArtists() const;
|
|
||||||
std::vector<pointer> getSimilarReleases(std::optional<std::size_t> offset = {}, std::optional<std::size_t> count = {}) const;
|
|
||||||
|
|
||||||
|
|
||||||
template<class Action>
|
template<class Action>
|
||||||
void persist(Action& a)
|
void persist(Action& a)
|
||||||
{
|
{
|
||||||
Wt::Dbo::field(a, _name, "name");
|
Wt::Dbo::field(a, _name, "name");
|
||||||
Wt::Dbo::field(a, _MBID, "mbid");
|
Wt::Dbo::field(a, _MBID, "mbid");
|
||||||
Wt::Dbo::field(a, _totalDisc, "total_disc");
|
Wt::Dbo::field(a, _totalDisc, "total_disc");
|
||||||
Wt::Dbo::field(a, _primaryType, "primary_type");
|
Wt::Dbo::field(a, _primaryType, "primary_type");
|
||||||
Wt::Dbo::field(a, _secondaryTypes, "secondary_types");
|
Wt::Dbo::field(a, _secondaryTypes, "secondary_types");
|
||||||
|
|
||||||
Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToOne, "release");
|
Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToOne, "release");
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class Session;
|
friend class Session;
|
||||||
Release(const std::string& name, const std::optional<UUID>& MBID = {});
|
Release(const std::string& name, const std::optional<UUID>& MBID = {});
|
||||||
static pointer create(Session& session, const std::string& name, const std::optional<UUID>& MBID = {});
|
static pointer create(Session& session, const std::string& name, const std::optional<UUID>& MBID = {});
|
||||||
|
|
||||||
Wt::WDate getReleaseDate(bool original) const;
|
Wt::WDate getReleaseDate(bool original) const;
|
||||||
|
|
||||||
static constexpr std::size_t _maxNameLength {128};
|
static constexpr std::size_t _maxNameLength{ 128 };
|
||||||
|
|
||||||
std::string _name;
|
std::string _name;
|
||||||
std::string _MBID;
|
std::string _MBID;
|
||||||
std::optional<int> _totalDisc {};
|
std::optional<int> _totalDisc{};
|
||||||
std::optional<ReleaseTypePrimary> _primaryType;
|
std::optional<ReleaseTypePrimary> _primaryType;
|
||||||
EnumSet<ReleaseTypeSecondary> _secondaryTypes;
|
EnumSet<ReleaseTypeSecondary> _secondaryTypes;
|
||||||
|
|
||||||
Wt::Dbo::collection<Wt::Dbo::ptr<Track>> _tracks; // Tracks in the release
|
Wt::Dbo::collection<Wt::Dbo::ptr<Track>> _tracks; // Tracks in the release
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Database
|
} // namespace Database
|
||||||
|
|
||||||
|
|||||||
@@ -83,6 +83,12 @@ namespace Database
|
|||||||
static DateRange fromYearRange(int from, int to);
|
static DateRange fromYearRange(int from, int to);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct DiscInfo
|
||||||
|
{
|
||||||
|
std::size_t position;
|
||||||
|
std::string name;
|
||||||
|
};
|
||||||
|
|
||||||
enum class ArtistSortMethod
|
enum class ArtistSortMethod
|
||||||
{
|
{
|
||||||
None,
|
None,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ add_library(lmssubsonic SHARED
|
|||||||
impl/responses/Artist.cpp
|
impl/responses/Artist.cpp
|
||||||
impl/responses/Bookmark.cpp
|
impl/responses/Bookmark.cpp
|
||||||
impl/responses/Contributor.cpp
|
impl/responses/Contributor.cpp
|
||||||
|
impl/responses/DiscTitle.cpp
|
||||||
impl/responses/Genre.cpp
|
impl/responses/Genre.cpp
|
||||||
impl/responses/Playlist.cpp
|
impl/responses/Playlist.cpp
|
||||||
impl/responses/Song.cpp
|
impl/responses/Song.cpp
|
||||||
|
|||||||
@@ -28,6 +28,7 @@
|
|||||||
#include "utils/String.hpp"
|
#include "utils/String.hpp"
|
||||||
|
|
||||||
#include "responses/Artist.hpp"
|
#include "responses/Artist.hpp"
|
||||||
|
#include "responses/DiscTitle.hpp"
|
||||||
#include "SubsonicId.hpp"
|
#include "SubsonicId.hpp"
|
||||||
|
|
||||||
namespace API::Subsonic
|
namespace API::Subsonic
|
||||||
@@ -175,6 +176,11 @@ namespace API::Subsonic
|
|||||||
for (const ReleaseTypeSecondary releaseType : release->getSecondaryTypes())
|
for (const ReleaseTypeSecondary releaseType : release->getSecondaryTypes())
|
||||||
albumNode.addArrayValue("releaseTypes", toString(releaseType));
|
albumNode.addArrayValue("releaseTypes", toString(releaseType));
|
||||||
|
|
||||||
|
// disc titles
|
||||||
|
albumNode.createEmptyArrayChild("discTitles");
|
||||||
|
for (const DiscInfo& discInfo : release->getDiscs())
|
||||||
|
albumNode.addArrayChild("discTitles", createDiscTitle(discInfo));
|
||||||
|
|
||||||
return albumNode;
|
return albumNode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Emeric Poupon
|
||||||
|
*
|
||||||
|
* This file is part of LMS.
|
||||||
|
*
|
||||||
|
* LMS is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* LMS is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "responses/DiscTitle.hpp"
|
||||||
|
|
||||||
|
namespace API::Subsonic
|
||||||
|
{
|
||||||
|
Response::Node createDiscTitle(const Database::DiscInfo& discInfo)
|
||||||
|
{
|
||||||
|
Response::Node discTitleNode;
|
||||||
|
|
||||||
|
discTitleNode.setAttribute("disc", discInfo.position);
|
||||||
|
discTitleNode.setAttribute("title", discInfo.name);
|
||||||
|
|
||||||
|
return discTitleNode;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Emeric Poupon
|
||||||
|
*
|
||||||
|
* This file is part of LMS.
|
||||||
|
*
|
||||||
|
* LMS is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* LMS is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "services/database/Types.hpp"
|
||||||
|
#include "SubsonicResponse.hpp"
|
||||||
|
|
||||||
|
namespace API::Subsonic
|
||||||
|
{
|
||||||
|
Response::Node createDiscTitle(const Database::DiscInfo& discInfo);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user