Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Queue count badge showing warning/error incorrectly

This commit is contained in:
Mark McDowall 2019-03-22 19:15:58 -07:00
parent 95bb73c5ac
commit db41104d9b
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/Activity/Queue/Status/QueueStatusConnector.js
View File

@ -12,7 +12,12 @@ function createMapStateToProps() {
(state) => state.queue.options.includeUnknownSeriesItems, (state) => state.queue.options.includeUnknownSeriesItems,
(app, status, includeUnknownSeriesItems) => { (app, status, includeUnknownSeriesItems) => {
const { const {
errors,
warnings,
unknownErrors,
unknownWarnings,
count, count,
totalCount,
unknownCount unknownCount
} = status.item; } = status.item;
@ -21,7 +26,9 @@ function createMapStateToProps() {
isReconnecting: app.isReconnecting, isReconnecting: app.isReconnecting,
isPopulated: status.isPopulated, isPopulated: status.isPopulated,
...status.item, ...status.item,
count: includeUnknownSeriesItems ? count : count - unknownCount count: includeUnknownSeriesItems ? totalCount : count,
errors: includeUnknownSeriesItems ? errors || unknownErrors : errors,
warnings: includeUnknownSeriesItems ? warnings || unknownWarnings : warnings
}; };
} }
); );

9
src/Sonarr.Api.V3/Queue/QueueStatusModule.cs
View File

@ -46,10 +46,13 @@ namespace Sonarr.Api.V3.Queue
var resource = new QueueStatusResource var resource = new QueueStatusResource
{ {
Count = queue.Count + pending.Count, TotalCount = queue.Count + pending.Count,
Count = queue.Count(q => q.Series != null) + pending.Count,
UnknownCount = queue.Count(q => q.Series == null), UnknownCount = queue.Count(q => q.Series == null),
Errors = queue.Any(q => q.TrackedDownloadStatus.Equals("Error", StringComparison.InvariantCultureIgnoreCase)), Errors = queue.Any(q => q.Series != null && q.TrackedDownloadStatus.Equals("Error", StringComparison.InvariantCultureIgnoreCase)),
Warnings = queue.Any(q => q.TrackedDownloadStatus.Equals("Warning", StringComparison.InvariantCultureIgnoreCase)) Warnings = queue.Any(q => q.Series != null && q.TrackedDownloadStatus.Equals("Warning", StringComparison.InvariantCultureIgnoreCase)),
UnknownErrors = queue.Any(q => q.Series == null && q.TrackedDownloadStatus.Equals("Error", StringComparison.InvariantCultureIgnoreCase)),
UnknownWarnings = queue.Any(q => q.Series == null && q.TrackedDownloadStatus.Equals("Warning", StringComparison.InvariantCultureIgnoreCase))
}; };
_broadcastDebounce.Resume(); _broadcastDebounce.Resume();

3
src/Sonarr.Api.V3/Queue/QueueStatusResource.cs
View File

@ -4,9 +4,12 @@ namespace Sonarr.Api.V3.Queue
{ {
public class QueueStatusResource : RestResource public class QueueStatusResource : RestResource
{ {
public int TotalCount { get; set; }
public int Count { get; set; } public int Count { get; set; }
public int UnknownCount { get; set; } public int UnknownCount { get; set; }
public bool Errors { get; set; } public bool Errors { get; set; }
public bool Warnings { get; set; } public bool Warnings { get; set; }
public bool UnknownErrors { get; set; }
public bool UnknownWarnings { get; set; }
} }
} }