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

Centralized some db filters

Browse Source
This commit is contained in:
emeric
2025-02-09 18:35:09 +01:00
parent 13698c379b
commit b4bce77877
36 changed files with 297 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp
+14 -14
View File
@@ -67,7 +67,7 @@ namespace lms::api::subsonic
Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::Name);
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params);
}
@@ -76,7 +76,7 @@ namespace lms::api::subsonic
Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::ArtistNameThenName);
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params);
}
@@ -90,10 +90,10 @@ namespace lms::api::subsonic
if (const Cluster::pointer cluster{ clusterType->getCluster(genre) })
{
Release::FindParameters params;
params.setClusters(std::initializer_list<ClusterId>{ cluster->getId() });
params.filters.setMediaLibrary(mediaLibraryId);
params.filters.setClusters(std::initializer_list<ClusterId>{ cluster->getId() });
params.setSortMethod(ReleaseSortMethod::Name);
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params);
}
@@ -108,7 +108,7 @@ namespace lms::api::subsonic
params.setSortMethod(fromYear > toYear ? ReleaseSortMethod::DateDesc : ReleaseSortMethod::DateAsc);
params.setRange(range);
params.setDateRange(YearRange{ std::min(fromYear, toYear), std::max(fromYear, toYear) });
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params);
}
@@ -117,7 +117,7 @@ namespace lms::api::subsonic
scrobbling::IScrobblingService::FindParameters params;
params.setUser(context.user->getId());
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = scrobblingService.getTopReleases(params);
}
@@ -126,7 +126,7 @@ namespace lms::api::subsonic
Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::AddedDesc);
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params);
}
@@ -137,7 +137,7 @@ namespace lms::api::subsonic
Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::Random);
params.setRange(Range{ 0, size });
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params);
}
@@ -146,7 +146,7 @@ namespace lms::api::subsonic
scrobbling::IScrobblingService::FindParameters params;
params.setUser(context.user->getId());
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = scrobblingService.getRecentReleases(params);
}
@@ -155,7 +155,7 @@ namespace lms::api::subsonic
feedback::IFeedbackService::FindParameters params;
params.setUser(context.user->getId());
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
releases = feedbackService.findStarredReleases(params);
}
@@ -203,7 +203,7 @@ namespace lms::api::subsonic
feedback::IFeedbackService::FindParameters findParameters;
findParameters.setUser(context.user->getId());
findParameters.setMediaLibrary(mediaLibrary);
findParameters.filters.setMediaLibrary(mediaLibrary);
for (const ReleaseId releaseId : feedbackService.findStarredReleases(findParameters).results)
{
@@ -247,7 +247,7 @@ namespace lms::api::subsonic
Track::FindParameters params;
params.setSortMethod(TrackSortMethod::Random);
params.setRange(Range{ 0, size });
params.setMediaLibrary(mediaLibraryId);
params.filters.setMediaLibrary(mediaLibraryId);
Track::find(context.dbSession, params, [&](const Track::pointer& track) {
randomSongsNode.addArrayChild("song", createSongNode(context, track, context.user));
@@ -283,9 +283,9 @@ namespace lms::api::subsonic
Response::Node& songsByGenreNode{ response.createNode("songsByGenre") };
Track::FindParameters params;
params.setClusters(std::initializer_list<ClusterId>{ cluster->getId() });
params.filters.setClusters(std::initializer_list<ClusterId>{ cluster->getId() });
params.filters.setMediaLibrary(mediaLibrary);
params.setRange(Range{ offset, count });
params.setMediaLibrary(mediaLibrary);
Track::find(context.dbSession, params, [&](const Track::pointer& track) {
songsByGenreNode.addArrayChild("song", createSongNode(context, track, context.user));
src/libs/subsonic/impl/endpoints/Browsing.cpp
+1 -1
View File
@@ -398,7 +398,7 @@ namespace lms::api::subsonic
break;
}
}
parameters.setMediaLibrary(mediaLibrary);
parameters.filters.setMediaLibrary(mediaLibrary);
// This endpoint does not scale: make sort lived transactions in order not to block the whole application
src/libs/subsonic/impl/endpoints/Searching.cpp
+3 -3
View File
@@ -159,9 +159,9 @@ namespace lms::api::subsonic
ArtistId lastRetrievedId;
auto findArtists{ [&] {
Artist::FindParameters params;
params.filters.setMediaLibrary(mediaLibrary);
params.setKeywords(keywords);
params.setRange(Range{ artistOffset, artistCount });
params.setMediaLibrary(mediaLibrary);
params.setSortMethod(ArtistSortMethod::Id); // must be consistent with both methods
Artist::find(context.dbSession, params, [&](const Artist::pointer& artist) {
@@ -225,7 +225,7 @@ namespace lms::api::subsonic
Release::FindParameters params;
params.setKeywords(keywords);
params.setRange(Range{ albumOffset, albumCount });
params.setMediaLibrary(mediaLibrary);
params.filters.setMediaLibrary(mediaLibrary);
params.setSortMethod(ReleaseSortMethod::Id); // must be consistent with both methods
Release::find(context.dbSession, params, [&](const Release::pointer& release) {
@@ -289,7 +289,7 @@ namespace lms::api::subsonic
Track::FindParameters params;
params.setKeywords(keywords);
params.setRange(Range{ songOffset, songCount });
params.setMediaLibrary(mediaLibrary);
params.filters.setMediaLibrary(mediaLibrary);
params.setSortMethod(TrackSortMethod::Id); // must be consistent with both methods
Track::find(context.dbSession, params, [&](const Track::pointer& track) {