github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 13:10:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve Load Time of Artist Detail Page, and Wanted Page

Browse source
This commit is contained in:
Qstick 2017-10-07 23:01:49 -04:00
commit a37be66f34
3 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Lidarr.Api.V3/Albums/AlbumModuleWithSignalR.cs
View file

@ -98,12 +98,9 @@ namespace Lidarr.Api.V3.Albums
} }
} }
for (var i = 0; i < albums.Count; i++) var artistList = albums.DistinctBy(a => a.ArtistId).ToList();
{ var artistStats = _artistStatisticsService.ArtistStatistics();
var resource = result[i]; LinkArtistStatistics(result, artistStats);
FetchAndLinkAlbumStatistics(resource);
}
return result; return result;
} }
@ -113,6 +110,15 @@ namespace Lidarr.Api.V3.Albums
LinkArtistStatistics(resource, _artistStatisticsService.ArtistStatistics(resource.ArtistId)); LinkArtistStatistics(resource, _artistStatisticsService.ArtistStatistics(resource.ArtistId));
} }
private void LinkArtistStatistics(List<AlbumResource> resources, List<ArtistStatistics> artistStatistics)
{
foreach (var album in resources)
{
var stats = artistStatistics.SingleOrDefault(ss => ss.ArtistId == album.ArtistId);
LinkArtistStatistics(album, stats);
}
}
private void LinkArtistStatistics(AlbumResource resource, ArtistStatistics artistStatistics) private void LinkArtistStatistics(AlbumResource resource, ArtistStatistics artistStatistics)
{ {
if (artistStatistics.AlbumStatistics != null) if (artistStatistics.AlbumStatistics != null)

2
src/Lidarr.Api.V3/Wanted/MissingModule.cs
View file

@ -31,7 +31,7 @@ namespace Lidarr.Api.V3.Wanted
SortDirection = pagingResource.SortDirection SortDirection = pagingResource.SortDirection
}; };
var includeArtist = Request.GetBooleanQueryParameter("includeSeries"); var includeArtist = Request.GetBooleanQueryParameter("includeArtist");
if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false") if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false")
{ {

33
src/NzbDrone.Core/Music/AlbumRepository.cs
View file

@ -80,29 +80,33 @@ namespace NzbDrone.Core.Music
private QueryBuilder<Album> GetMissingAlbumsQuery(PagingSpec<Album> pagingSpec, DateTime currentTime) private QueryBuilder<Album> GetMissingAlbumsQuery(PagingSpec<Album> pagingSpec, DateTime currentTime)
{ {
string sortKey; string sortKey;
string monitored = "([t0].[Monitored] = 0) OR ([t1].[Monitored] = 0)"; string monitored = "(Albums.[Monitored] = 0) OR (Artists.[Monitored] = 0)";
if (pagingSpec.FilterExpression.ToString().Contains("True")) if (pagingSpec.FilterExpression.ToString().Contains("True"))
{ {
monitored = "([t0].[Monitored] = 1) AND ([t1].[Monitored] = 1)"; monitored = "(Albums.[Monitored] = 1) AND (Artists.[Monitored] = 1)";
} }
if (pagingSpec.SortKey == "releaseDate") if (pagingSpec.SortKey == "releaseDate")
{ {
sortKey = "[t0]." + pagingSpec.SortKey; sortKey = "Albums." + pagingSpec.SortKey;
} }
else if (pagingSpec.SortKey == "artist.sortName") else if (pagingSpec.SortKey == "artist.sortName")
{ {
sortKey = "[t1]." + pagingSpec.SortKey.Split('.').Last(); sortKey = "Artists." + pagingSpec.SortKey.Split('.').Last();
} }
else else
{ {
sortKey = "[t0].releaseDate"; sortKey = "Albums.releaseDate";
} }
string query = string.Format("SELECT * FROM Albums [t0] INNER JOIN Artists [t1] ON ([t0].[ArtistId] = [t1].[Id])" + string query = string.Format("SELECT Albums.* FROM (SELECT Tracks.AlbumId, COUNT(*) AS TotalTrackCount," + "" +
"WHERE ({0}) AND {1}" + "SUM(CASE WHEN TrackFileId > 0 THEN 1 ELSE 0 END) AS AvailableTrackCount FROM Tracks GROUP BY Tracks.ArtistId, Tracks.AlbumId) as Tracks" +
" AND NOT EXISTS (SELECT 1 from Tracks [t2] WHERE [t2].albumId = [t0].id AND [t2].trackFileId <> 0) ORDER BY {2} {3} LIMIT {4} OFFSET {5}", " LEFT OUTER JOIN Albums ON Tracks.AlbumId == Albums.Id" +
" LEFT OUTER JOIN Artists ON Albums.ArtistId == Artists.Id" +
" WHERE Tracks.TotalTrackCount != Tracks.AvailableTrackCount AND ({0}) AND {1}" +
" GROUP BY Tracks.AlbumId" +
" ORDER BY {2} {3} LIMIT {4} OFFSET {5}",
monitored, BuildReleaseDateCutoffWhereClause(currentTime), sortKey, pagingSpec.ToSortDirection(), pagingSpec.PageSize, pagingSpec.PagingOffset()); monitored, BuildReleaseDateCutoffWhereClause(currentTime), sortKey, pagingSpec.ToSortDirection(), pagingSpec.PageSize, pagingSpec.PagingOffset());
return Query.QueryText(query); return Query.QueryText(query);
@ -127,9 +131,12 @@ namespace NzbDrone.Core.Music
monitored = 1; monitored = 1;
} }
string query = string.Format("SELECT * FROM Albums [t0] INNER JOIN Artists [t1] ON ([t0].[ArtistId] = [t1].[Id])" + string query = string.Format("SELECT Albums.* FROM (SELECT Tracks.AlbumId, COUNT(*) AS TotalTrackCount," +
"WHERE (([t0].[Monitored] = {0}) AND ([t1].[Monitored] = {0})) AND {1}" + " SUM(CASE WHEN TrackFileId > 0 THEN 1 ELSE 0 END) AS AvailableTrackCount FROM Tracks GROUP BY Tracks.ArtistId, Tracks.AlbumId) as Tracks" +
" AND NOT EXISTS (SELECT 1 from Tracks [t2] WHERE [t2].albumId = [t0].id AND [t2].trackFileId <> 0)", " LEFT OUTER JOIN Albums ON Tracks.AlbumId == Albums.Id" +
" LEFT OUTER JOIN Artists ON Albums.ArtistId == Artists.Id" +
" WHERE Tracks.TotalTrackCount != Tracks.AvailableTrackCount AND ({0}) AND {1}" +
" GROUP BY Tracks.AlbumId",
monitored, BuildReleaseDateCutoffWhereClause(currentTime)); monitored, BuildReleaseDateCutoffWhereClause(currentTime));
return Query.QueryText(query).Count(); return Query.QueryText(query).Count();
@ -137,7 +144,7 @@ namespace NzbDrone.Core.Music
private string BuildReleaseDateCutoffWhereClause(DateTime currentTime) private string BuildReleaseDateCutoffWhereClause(DateTime currentTime)
{ {
return string.Format("datetime(strftime('%s', [t0].[ReleaseDate]), 'unixepoch') <= '{0}'", return string.Format("datetime(strftime('%s', Albums.[ReleaseDate]), 'unixepoch') <= '{0}'",
currentTime.ToString("yyyy-MM-dd HH:mm:ss")); currentTime.ToString("yyyy-MM-dd HH:mm:ss"));
} }
@ -184,7 +191,7 @@ namespace NzbDrone.Core.Music
var query = Query.Join<Album, Artist>(JoinType.Inner, album => album.Artist, (album, artist) => album.ArtistId == artist.Id) var query = Query.Join<Album, Artist>(JoinType.Inner, album => album.Artist, (album, artist) => album.ArtistId == artist.Id)
.Where<Artist>(artist => artist.CleanName == cleanArtistName) .Where<Artist>(artist => artist.CleanName == cleanArtistName)
.Where<Album>(album => album.CleanTitle == cleanTitle); .Where<Album>(album => album.CleanTitle == cleanTitle);
return Query.Join<Album, Artist>(JoinType.Inner, album => album.Artist, (album, artist) => album.ArtistId == artist.Id ) return Query.Join<Album, Artist>(JoinType.Inner, album => album.Artist, (album, artist) => album.ArtistId == artist.Id)
.Where<Artist>(artist => artist.CleanName == cleanArtistName) .Where<Artist>(artist => artist.CleanName == cleanArtistName)
.Where<Album>(album => album.CleanTitle == cleanTitle) .Where<Album>(album => album.CleanTitle == cleanTitle)
.SingleOrDefault(); .SingleOrDefault();