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

New: Show User Agent in System->Tasks for externally triggered commands (#2261)

Browse source
This commit is contained in:
Robin Dadswell 2021-05-23 06:27:22 +01:00 • committed by GitHub
commit bc6261efb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Lidarr.Api.V1/Commands/CommandModule.cs
View file

@ -57,6 +57,8 @@ namespace Lidarr.Api.V1.Commands
command.SuppressMessages = !command.SendUpdatesToClient;
command.SendUpdatesToClient = true;
command.ClientUserAgent = Request.Headers.UserAgent;
var trackedCommand = _commandQueueManager.Push(command, CommandPriority.Normal, CommandTrigger.Manual);
return trackedCommand.Id;
}

5
src/Lidarr.Api.V1/Commands/CommandResource.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using Lidarr.Http.REST;
using Newtonsoft.Json;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Core.Messaging.Commands;
namespace Lidarr.Api.V1.Commands
@ -23,6 +24,8 @@ namespace Lidarr.Api.V1.Commands
public string Exception { get; set; }
public CommandTrigger Trigger { get; set; }
public string ClientUserAgent { get; set; }
[JsonIgnore]
public string CompletionMessage { get; set; }
@ -106,6 +109,8 @@ namespace Lidarr.Api.V1.Commands
Exception = model.Exception,
Trigger = model.Trigger,
ClientUserAgent = UserAgentParser.SimplifyUserAgent(model.Body.ClientUserAgent),
CompletionMessage = model.Body.CompletionMessage,
LastExecutionTime = model.Body.LastExecutionTime
};

21
src/NzbDrone.Common/Http/UserAgentParser.cs Normal file
View file

@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace NzbDrone.Common.Http
{
public static class UserAgentParser
{
public static string SimplifyUserAgent(string userAgent)
{
if (userAgent == null || userAgent.StartsWith("Mozilla/5.0"))
{
return null;
}
return userAgent;
}
}
}

2
src/NzbDrone.Core/Messaging/Commands/Command.cs
View file

@ -32,6 +32,8 @@ namespace NzbDrone.Core.Messaging.Commands
public CommandTrigger Trigger { get; set; }
public bool SuppressMessages { get; set; }
public string ClientUserAgent { get; set; }
public Command()
{
Name = GetType().Name.Replace("Command", "");