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

OpenSubsonic API: added support for 'played' fields

Browse Source
This commit is contained in:
emeric
2023-10-16 23:27:29 +02:00
parent 6a3783a4ba
commit 079f7922b4
9 changed files with 1042 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBSONIC.md
+2
View File
@@ -11,6 +11,7 @@ OpenSubsonic is an initiative to patch and extend the legacy Subsonic API. You'l
## Extra fields ## Extra fields
The following extra fields are implemented: The following extra fields are implemented:
* `Album` response: * `Album` response:
* `played`
* `musicBrainzId` * `musicBrainzId`
* `genres` * `genres`
* `artists` * `artists`
@@ -21,6 +22,7 @@ The following extra fields are implemented:
* `isCompilation` * `isCompilation`
* `discTitles`: discs with no subtitle are omitted * `discTitles`: discs with no subtitle are omitted
* `Child` response: * `Child` response:
* `played`
* `musicBrainzId`: note this is actually the recording MBID when this response refers to a song * `musicBrainzId`: note this is actually the recording MBID when this response refers to a song
* `genres` * `genres`
* `artists` * `artists`
src/libs/services/database/impl/Listen.cpp
+64 -80
View File
@@ -29,15 +29,14 @@ namespace
{ {
using namespace Database; using namespace Database;
Wt::Dbo::Query<ArtistId> Wt::Dbo::Query<ArtistId> createArtistsQuery(Wt::Dbo::Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType)
createArtistsQuery(Wt::Dbo::Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType)
{ {
auto query {session.query<ArtistId>("SELECT a.id from artist a") auto query{ session.query<ArtistId>("SELECT a.id from artist a")
.join("track t ON t.id = t_a_l.track_id") .join("track t ON t.id = t_a_l.track_id")
.join("track_artist_link t_a_l ON t_a_l.artist_id = a.id") .join("track_artist_link t_a_l ON t_a_l.artist_id = a.id")
.join("listen l ON l.track_id = t.id") .join("listen l ON l.track_id = t.id")
.where("l.user_id = ?").bind(userId) .where("l.user_id = ?").bind(userId)
.where("l.scrobbler = ?").bind(scrobbler)}; .where("l.scrobbler = ?").bind(scrobbler) };
if (linkType) if (linkType)
query.where("t_a_l.type = ?").bind(*linkType); query.where("t_a_l.type = ?").bind(*linkType);
@@ -67,14 +66,13 @@ namespace
return query; return query;
} }
Wt::Dbo::Query<ReleaseId> Wt::Dbo::Query<ReleaseId> createReleasesQuery(Wt::Dbo::Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds)
createReleasesQuery(Wt::Dbo::Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds)
{ {
auto query {session.query<ReleaseId>("SELECT r.id from release r") auto query{ session.query<ReleaseId>("SELECT r.id from release r")
.join("track t ON t.release_id = r.id") .join("track t ON t.release_id = r.id")
.join("listen l ON l.track_id = t.id") .join("listen l ON l.track_id = t.id")
.where("l.user_id = ?").bind(userId) .where("l.user_id = ?").bind(userId)
.where("l.scrobbler = ?").bind(scrobbler)}; .where("l.scrobbler = ?").bind(scrobbler) };
if (!clusterIds.empty()) if (!clusterIds.empty())
{ {
@@ -100,13 +98,12 @@ namespace
return query; return query;
} }
Wt::Dbo::Query<TrackId> Wt::Dbo::Query<TrackId> createTracksQuery(Wt::Dbo::Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds)
createTracksQuery(Wt::Dbo::Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds)
{ {
auto query {session.query<TrackId>("SELECT t.id from track t") auto query{ session.query<TrackId>("SELECT t.id from track t")
.join("listen l ON l.track_id = t.id") .join("listen l ON l.track_id = t.id")
.where("l.user_id = ?").bind(userId) .where("l.user_id = ?").bind(userId)
.where("l.scrobbler = ?").bind(scrobbler)}; .where("l.scrobbler = ?").bind(scrobbler) };
if (!clusterIds.empty()) if (!clusterIds.empty())
{ {
@@ -135,39 +132,35 @@ namespace
namespace Database namespace Database
{ {
Listen::Listen(ObjectPtr<User> user, ObjectPtr<Track> track, Scrobbler scrobbler, const Wt::WDateTime& dateTime) Listen::Listen(ObjectPtr<User> user, ObjectPtr<Track> track, Scrobbler scrobbler, const Wt::WDateTime& dateTime)
: _dateTime {Wt::WDateTime::fromTime_t(dateTime.toTime_t())} : _dateTime{ Wt::WDateTime::fromTime_t(dateTime.toTime_t()) }
, _scrobbler {scrobbler} , _scrobbler{ scrobbler }
, _user {getDboPtr(user)} , _user{ getDboPtr(user) }
, _track {getDboPtr(track)} , _track{ getDboPtr(track) }
{} {}
Listen::pointer Listen::pointer Listen::create(Session& session, ObjectPtr<User> user, ObjectPtr<Track> track, Scrobbler scrobbler, const Wt::WDateTime& dateTime)
Listen::create(Session& session, ObjectPtr<User> user, ObjectPtr<Track> track, Scrobbler scrobbler, const Wt::WDateTime& dateTime)
{ {
return session.getDboSession().add(std::unique_ptr<Listen> {new Listen {user, track, scrobbler, dateTime}}); return session.getDboSession().add(std::unique_ptr<Listen> {new Listen{ user, track, scrobbler, dateTime }});
} }
std::size_t std::size_t Listen::getCount(Session& session)
Listen::getCount(Session& session)
{ {
session.checkSharedLocked(); session.checkSharedLocked();
return session.getDboSession().query<int>("SELECT COUNT(*) FROM listen"); return session.getDboSession().query<int>("SELECT COUNT(*) FROM listen");
} }
Listen::pointer Listen::pointer Listen::find(Session& session, ListenId id)
Listen::find(Session& session, ListenId id)
{ {
session.checkSharedLocked(); session.checkSharedLocked();
return session.getDboSession().find<Listen>().where("id = ?").bind(id).resultValue(); return session.getDboSession().find<Listen>().where("id = ?").bind(id).resultValue();
} }
RangeResults<ListenId> RangeResults<ListenId> Listen::find(Session& session, const FindParameters& parameters)
Listen::find(Session& session, const FindParameters& parameters)
{ {
session.checkSharedLocked(); session.checkSharedLocked();
auto query {session.getDboSession().query<ListenId>("SELECT id FROM listen") auto query{ session.getDboSession().query<ListenId>("SELECT id FROM listen")
.orderBy("date_time")}; .orderBy("date_time") };
if (parameters.user.isValid()) if (parameters.user.isValid())
query.where("user_id = ?").bind(parameters.user); query.where("user_id = ?").bind(parameters.user);
@@ -181,8 +174,7 @@ namespace Database
return Utils::execQuery(query, parameters.range); return Utils::execQuery(query, parameters.range);
} }
Listen::pointer Listen::pointer Listen::find(Session& session, UserId userId, TrackId trackId, Scrobbler scrobbler, const Wt::WDateTime& dateTime)
Listen::find(Session& session, UserId userId, TrackId trackId, Scrobbler scrobbler, const Wt::WDateTime& dateTime)
{ {
session.checkSharedLocked(); session.checkSharedLocked();
@@ -194,94 +186,86 @@ namespace Database
.resultValue(); .resultValue();
} }
RangeResults<ArtistId> RangeResults<ArtistId> Listen::getTopArtists(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range)
Listen::getTopArtists(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
std::optional<TrackArtistLinkType> linkType,
Range range)
{ {
auto query {createArtistsQuery(session.getDboSession(), userId, scrobbler, clusterIds, linkType)}; auto query{ createArtistsQuery(session.getDboSession(), userId, scrobbler, clusterIds, linkType) };
auto collection {query auto collection{ query
.orderBy("COUNT(a.id) DESC") .orderBy("COUNT(a.id) DESC")
.groupBy("a.id")}; .groupBy("a.id") };
return Utils::execQuery(query, range); return Utils::execQuery(query, range);
} }
RangeResults<ReleaseId> RangeResults<ReleaseId> Listen::getTopReleases(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range)
Listen::getTopReleases(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range)
{ {
auto query {createReleasesQuery(session.getDboSession(), userId, scrobbler, clusterIds) auto query{ createReleasesQuery(session.getDboSession(), userId, scrobbler, clusterIds)
.orderBy("COUNT(r.id) DESC") .orderBy("COUNT(r.id) DESC")
.groupBy("r.id")}; .groupBy("r.id") };
return Utils::execQuery(query, range); return Utils::execQuery(query, range);
} }
RangeResults<TrackId> RangeResults<TrackId> Listen::getTopTracks(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range)
Listen::getTopTracks(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range)
{ {
auto query {createTracksQuery(session.getDboSession(), userId, scrobbler, clusterIds) auto query{ createTracksQuery(session.getDboSession(), userId, scrobbler, clusterIds)
.orderBy("COUNT(t.id) DESC") .orderBy("COUNT(t.id) DESC")
.groupBy("t.id")}; .groupBy("t.id") };
return Utils::execQuery(query, range); return Utils::execQuery(query, range);
} }
RangeResults<ArtistId> RangeResults<ArtistId> Listen::getRecentArtists(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range)
Listen::getRecentArtists(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
std::optional<TrackArtistLinkType> linkType,
Range range)
{ {
auto query {createArtistsQuery(session.getDboSession(), userId, scrobbler, clusterIds, linkType) auto query{ createArtistsQuery(session.getDboSession(), userId, scrobbler, clusterIds, linkType)
.groupBy("a.id").having("l.date_time = MAX(l.date_time)") .groupBy("a.id").having("l.date_time = MAX(l.date_time)")
.orderBy("l.date_time DESC")}; .orderBy("l.date_time DESC") };
return Utils::execQuery(query, range); return Utils::execQuery(query, range);
} }
RangeResults<ReleaseId> RangeResults<ReleaseId> Listen::getRecentReleases(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range)
Listen::getRecentReleases(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range)
{ {
auto query {createReleasesQuery(session.getDboSession(), userId, scrobbler, clusterIds) auto query{ createReleasesQuery(session.getDboSession(), userId, scrobbler, clusterIds)
.groupBy("r.id").having("l.date_time = MAX(l.date_time)") .groupBy("r.id").having("l.date_time = MAX(l.date_time)")
.orderBy("l.date_time DESC")}; .orderBy("l.date_time DESC") };
return Utils::execQuery(query, range); return Utils::execQuery(query, range);
} }
RangeResults<TrackId> RangeResults<TrackId> Listen::getRecentTracks(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range)
Listen::getRecentTracks(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range)
{ {
auto query {createTracksQuery(session.getDboSession(), userId, scrobbler, clusterIds) auto query{ createTracksQuery(session.getDboSession(), userId, scrobbler, clusterIds)
.groupBy("t.id").having("l.date_time = MAX(l.date_time)") .groupBy("t.id").having("l.date_time = MAX(l.date_time)")
.orderBy("l.date_time DESC")}; .orderBy("l.date_time DESC") };
return Utils::execQuery(query, range); return Utils::execQuery(query, range);
} }
Listen::pointer Listen::getMostRecentListen(Session& session, UserId userId, Scrobbler scrobbler, ReleaseId releaseId)
{
// TODO not pending remove?
return session.getDboSession().query<Wt::Dbo::ptr<Listen>>("SELECT l from listen l")
.join("track t ON l.track_id = t.id")
.where("t.release_id = ?").bind(releaseId)
.where("l.user_id = ?").bind(userId)
.where("l.scrobbler = ?").bind(scrobbler)
.orderBy("l.date_time DESC")
.limit(1)
.resultValue();
}
Listen::pointer Listen::getMostRecentListen(Session& session, UserId userId, Scrobbler scrobbler, TrackId trackId)
{
// TODO not pending remove?
return session.getDboSession().query<Wt::Dbo::ptr<Listen>>("SELECT l from listen l")
.join("track t ON track_id = t.id")
.where("t.id = ?").bind(trackId)
.where("l.user_id = ?").bind(userId)
.where("l.scrobbler = ?").bind(scrobbler)
.orderBy("l.date_time DESC")
.limit(1)
.resultValue();
}
} // namespace Database } // namespace Database
src/libs/services/database/include/services/database/Listen.hpp
+17 -40
View File
@@ -34,12 +34,12 @@
namespace Database namespace Database
{ {
class Session; class Session;
class Track; class Track;
class User; class User;
class Listen final : public Object<Listen, ListenId> class Listen final : public Object<Listen, ListenId>
{ {
public: public:
Listen() = default; Listen() = default;
@@ -53,7 +53,7 @@ class Listen final : public Object<Listen, ListenId>
FindParameters& setUser(UserId _user) { user = _user; return *this; } FindParameters& setUser(UserId _user) { user = _user; return *this; }
FindParameters& setScrobbler(Scrobbler _scrobbler) { scrobbler = _scrobbler; return *this; } FindParameters& setScrobbler(Scrobbler _scrobbler) { scrobbler = _scrobbler; return *this; }
FindParameters& setScrobblingState(ScrobblingState _scrobblingState) { scrobblingState = _scrobblingState; return *this; } FindParameters& setScrobblingState(ScrobblingState _scrobblingState) { scrobblingState = _scrobblingState; return *this; }
FindParameters& setRange(Range _range) {range = _range; return *this; } FindParameters& setRange(Range _range) { range = _range; return *this; }
}; };
// Accessors // Accessors
@@ -63,39 +63,16 @@ class Listen final : public Object<Listen, ListenId>
static RangeResults<ListenId> find(Session& session, const FindParameters& parameters); static RangeResults<ListenId> find(Session& session, const FindParameters& parameters);
// Stats // Stats
static RangeResults<ArtistId> getTopArtists(Session& session, static RangeResults<ArtistId> getTopArtists(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range = {});
UserId userId, static RangeResults<ReleaseId> getTopReleases(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range = {});
Scrobbler scrobbler, static RangeResults<TrackId> getTopTracks(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range = {});
const std::vector<ClusterId>& clusterIds,
std::optional<TrackArtistLinkType> linkType,
Range range = {});
static RangeResults<ReleaseId> getTopReleases(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range = {});
static RangeResults<TrackId> getTopTracks(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range = {});
static RangeResults<ArtistId> getRecentArtists(Session& session, static RangeResults<ArtistId> getRecentArtists(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range = {});
UserId userId, static RangeResults<ReleaseId> getRecentReleases(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range = {});
Scrobbler scrobbler, static RangeResults<TrackId> getRecentTracks(Session& session, UserId userId, Scrobbler scrobbler, const std::vector<ClusterId>& clusterIds, Range range = {});
const std::vector<ClusterId>& clusterIds,
std::optional<TrackArtistLinkType> linkType, static pointer getMostRecentListen(Session& session, UserId userId, Scrobbler scrobbler, ReleaseId releaseId);
Range range = {}); static pointer getMostRecentListen(Session& session, UserId userId, Scrobbler scrobbler, TrackId releaseId);
static RangeResults<ReleaseId> getRecentReleases(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range = {});
static RangeResults<TrackId> getRecentTracks(Session& session,
UserId userId,
Scrobbler scrobbler,
const std::vector<ClusterId>& clusterIds,
Range range = {});
ScrobblingState getScrobblingState() const { return _scrobblingState; } ScrobblingState getScrobblingState() const { return _scrobblingState; }
ObjectPtr<User> getUser() const { return _user; } ObjectPtr<User> getUser() const { return _user; }
@@ -122,11 +99,11 @@ class Listen final : public Object<Listen, ListenId>
Wt::WDateTime _dateTime; Wt::WDateTime _dateTime;
Scrobbler _scrobbler; Scrobbler _scrobbler;
ScrobblingState _scrobblingState {ScrobblingState::PendingAdd}; ScrobblingState _scrobblingState{ ScrobblingState::PendingAdd };
Wt::Dbo::ptr<User> _user; Wt::Dbo::ptr<User> _user;
Wt::Dbo::ptr<Track> _track; Wt::Dbo::ptr<Track> _track;
}; };
} // namespace Database } // namespace Database
src/libs/services/database/test/Listen.cpp
+398 -299
View File
File diff suppressed because it is too large Load Diff
src/libs/services/scrobbling/impl/ScrobblingService.cpp
+26
View File
@@ -133,6 +133,32 @@ namespace Scrobbling
return res; return res;
} }
Wt::WDateTime ScrobblingService::getLastListenDateTime(Database::UserId userId, Database::ReleaseId releaseId)
{
auto scrobbler{ getUserScrobbler(userId) };
if (!scrobbler)
return {};
Session& session{ _db.getTLSSession() };
auto transaction{ session.createSharedTransaction() };
const Database::Listen::pointer listen{ Database::Listen::getMostRecentListen(session, userId, *scrobbler, releaseId) };
return listen ? listen->getDateTime() : Wt::WDateTime{};
}
Wt::WDateTime ScrobblingService::getLastListenDateTime(Database::UserId userId, Database::TrackId trackId)
{
auto scrobbler{ getUserScrobbler(userId) };
if (!scrobbler)
return {};
Session& session{ _db.getTLSSession() };
auto transaction{ session.createSharedTransaction() };
const Database::Listen::pointer listen{ Database::Listen::getMostRecentListen(session, userId, *scrobbler, trackId) };
return listen ? listen->getDateTime() : Wt::WDateTime{};
}
// Top // Top
ScrobblingService::ArtistContainer ScrobblingService::getTopArtists(UserId userId, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range) ScrobblingService::ArtistContainer ScrobblingService::getTopArtists(UserId userId, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range)
{ {
src/libs/services/scrobbling/impl/ScrobblingService.hpp
+3
View File
@@ -52,6 +52,9 @@ namespace Scrobbling
const std::vector<Database::ClusterId>& clusterIds, const std::vector<Database::ClusterId>& clusterIds,
Database::Range range) override; Database::Range range) override;
Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::ReleaseId releaseId) override;
Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::TrackId trackId) override;
ArtistContainer getTopArtists(Database::UserId userId, ArtistContainer getTopArtists(Database::UserId userId,
const std::vector<Database::ClusterId>& clusterIds, const std::vector<Database::ClusterId>& clusterIds,
std::optional<Database::TrackArtistLinkType> linkType, std::optional<Database::TrackArtistLinkType> linkType,
src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
+3
View File
@@ -69,6 +69,9 @@ namespace Scrobbling
const std::vector<Database::ClusterId>& clusterIds, const std::vector<Database::ClusterId>& clusterIds,
Database::Range range) = 0; Database::Range range) = 0;
virtual Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::ReleaseId releaseId) = 0;
virtual Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::TrackId trackId) = 0;
// Top // Top
virtual ArtistContainer getTopArtists(Database::UserId userId, virtual ArtistContainer getTopArtists(Database::UserId userId,
const std::vector<Database::ClusterId>& clusterIds, const std::vector<Database::ClusterId>& clusterIds,
src/libs/subsonic/impl/responses/Album.cpp
+5
View File
@@ -138,6 +138,11 @@ namespace API::Subsonic
if (!id3) if (!id3)
albumNode.setAttribute("mediaType", "album"); albumNode.setAttribute("mediaType", "album");
{
const Wt::WDateTime dateTime{ Service<Scrobbling::IScrobblingService>::get()->getLastListenDateTime(user->getId(), release->getId()) };
albumNode.setAttribute("played", dateTime.isValid() ? StringUtils::toISO8601String(dateTime) : "");
}
{ {
std::optional<UUID> mbid{ release->getMBID() }; std::optional<UUID> mbid{ release->getMBID() };
albumNode.setAttribute("musicBrainzId", mbid ? mbid->getAsString() : ""); albumNode.setAttribute("musicBrainzId", mbid ? mbid->getAsString() : "");
src/libs/subsonic/impl/responses/Song.cpp
+5
View File
@@ -162,6 +162,11 @@ namespace API::Subsonic
// OpenSubsonic specific fields (must always be set) // OpenSubsonic specific fields (must always be set)
trackResponse.setAttribute("mediaType", "song"); trackResponse.setAttribute("mediaType", "song");
{
const Wt::WDateTime dateTime{ Service<Scrobbling::IScrobblingService>::get()->getLastListenDateTime(user->getId(), track->getId()) };
trackResponse.setAttribute("played", dateTime.isValid() ? StringUtils::toISO8601String(dateTime) : "");
}
{ {
std::optional<UUID> mbid{ track->getRecordingMBID() }; std::optional<UUID> mbid{ track->getRecordingMBID() };
trackResponse.setAttribute("musicBrainzId", mbid ? mbid->getAsString() : ""); trackResponse.setAttribute("musicBrainzId", mbid ? mbid->getAsString() : "");