self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-23 02:05:27 +02:00
Code Issues Releases Activity

Fixed: Filtering queue by multiple qualities

Browse Source
This commit is contained in:
Mark McDowall 2024-11-03 15:24:06 -08:00 committed by Mark McDowall
parent 78cf13d341
commit b8af3af9f1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Sonarr.Api.V3/Queue/QueueController.cs
View File

@ -136,7 +136,7 @@ public object RemoveMany([FromBody] QueueBulkResource resource, [FromQuery] bool
[HttpGet] [HttpGet]
[Produces("application/json")] [Produces("application/json")]
public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource paging, bool includeUnknownSeriesItems = false, bool includeSeries = false, bool includeEpisode = false, [FromQuery] int[] seriesIds = null, DownloadProtocol? protocol = null, [FromQuery] int[] languages = null, int? quality = null) public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource paging, bool includeUnknownSeriesItems = false, bool includeSeries = false, bool includeEpisode = false, [FromQuery] int[] seriesIds = null, DownloadProtocol? protocol = null, [FromQuery] int[] languages = null, [FromQuery] int[] quality = null)
{ {
var pagingResource = new PagingResource<QueueResource>(paging); var pagingResource = new PagingResource<QueueResource>(paging);
var pagingSpec = pagingResource.MapToPagingSpec<QueueResource, NzbDrone.Core.Queue.Queue>( var pagingSpec = pagingResource.MapToPagingSpec<QueueResource, NzbDrone.Core.Queue.Queue>(
@ -165,10 +165,10 @@ public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource
"timeleft", "timeleft",
SortDirection.Ascending); SortDirection.Ascending);
return pagingSpec.ApplyToPage((spec) => GetQueue(spec, seriesIds?.ToHashSet(), protocol, languages?.ToHashSet(), quality, includeUnknownSeriesItems), (q) => MapToResource(q, includeSeries, includeEpisode)); return pagingSpec.ApplyToPage((spec) => GetQueue(spec, seriesIds?.ToHashSet(), protocol, languages?.ToHashSet(), quality?.ToHashSet(), includeUnknownSeriesItems), (q) => MapToResource(q, includeSeries, includeEpisode));
} }
private PagingSpec<NzbDrone.Core.Queue.Queue> GetQueue(PagingSpec<NzbDrone.Core.Queue.Queue> pagingSpec, HashSet<int> seriesIds, DownloadProtocol? protocol, HashSet<int> languages, int? quality, bool includeUnknownSeriesItems) private PagingSpec<NzbDrone.Core.Queue.Queue> GetQueue(PagingSpec<NzbDrone.Core.Queue.Queue> pagingSpec, HashSet<int> seriesIds, DownloadProtocol? protocol, HashSet<int> languages, HashSet<int> quality, bool includeUnknownSeriesItems)
{ {
var ascending = pagingSpec.SortDirection == SortDirection.Ascending; var ascending = pagingSpec.SortDirection == SortDirection.Ascending;
var orderByFunc = GetOrderByFunc(pagingSpec); var orderByFunc = GetOrderByFunc(pagingSpec);
@ -179,6 +179,8 @@ public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource
var hasSeriesIdFilter = seriesIds.Any(); var hasSeriesIdFilter = seriesIds.Any();
var hasLanguageFilter = languages.Any(); var hasLanguageFilter = languages.Any();
var hasQualityFilter = quality.Any();
var fullQueue = filteredQueue.Concat(pending).Where(q => var fullQueue = filteredQueue.Concat(pending).Where(q =>
{ {
var include = true; var include = true;
@ -198,9 +200,9 @@ public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource
include &= q.Languages.Any(l => languages.Contains(l.Id)); include &= q.Languages.Any(l => languages.Contains(l.Id));
} }
if (include && quality.HasValue) if (include && hasQualityFilter)
{ {
include &= q.Quality.Quality.Id == quality.Value; include &= quality.Contains(q.Quality.Quality.Id);
} }
return include; return include;
@ -282,7 +284,7 @@ public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource
switch (pagingSpec.SortKey) switch (pagingSpec.SortKey)
{ {
case "status": case "status":
return q => q.Status; return q => q.Status.ToString();
case "series.sortTitle": case "series.sortTitle":
return q => q.Series?.SortTitle ?? q.Title; return q => q.Series?.SortTitle ?? q.Title;
case "title": case "title":