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

Updates to UI, Update NLog to 4.4.12

Browse source
This commit is contained in:
Qstick 2017-10-01 23:05:28 -04:00
parent 31db4e2026
commit c8ed46850a
88 changed files with 9550 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Lidarr.Api.V3/History/HistoryModule.cs
View file

@ -30,13 +30,23 @@ namespace Lidarr.Api.V3.History
Post["/failed"] = x => MarkAsFailed();
}
protected HistoryResource MapToResource(NzbDrone.Core.History.History model)
protected HistoryResource MapToResource(NzbDrone.Core.History.History model, bool includeArtist, bool includeAlbum, bool includeTrack)
{
var resource = model.ToResource();
resource.Artist = model.Artist.ToResource();
resource.Album = model.Album.ToResource();
resource.Track = model.Track.ToResource();
if (includeArtist)
{
resource.Artist = model.Artist.ToResource();
}
if (includeAlbum)
{
resource.Album = model.Album.ToResource();
}
if (includeTrack)
{
resource.Track = model.Track.ToResource();
}
if (model.Artist != null)
{
@ -52,6 +62,9 @@ namespace Lidarr.Api.V3.History
private PagingResource<HistoryResource> GetHistory(PagingResource<HistoryResource> pagingResource)
{
var pagingSpec = pagingResource.MapToPagingSpec<HistoryResource, NzbDrone.Core.History.History>("date", SortDirection.Descending);
var includeArtist = Request.GetBooleanQueryParameter("includeArtist");
var includeAlbum = Request.GetBooleanQueryParameter("includeAlbum");
var includeTrack = Request.GetBooleanQueryParameter("includeTrack");
if (pagingResource.FilterKey == "eventType")
{
@ -65,7 +78,7 @@ namespace Lidarr.Api.V3.History
pagingSpec.FilterExpression = h => h.AlbumId == albumId;
}
return ApplyToPage(_historyService.Paged, pagingSpec, MapToResource);
return ApplyToPage(_historyService.Paged, pagingSpec, h => MapToResource(h, includeArtist, includeAlbum, includeTrack));
}
private Response MarkAsFailed()