Show User Agent in System->Tasks for externally triggered commands (#63)

(cherry picked from commit fe8f319f7bfdadb7218b6313ada6cae1d2a35ad8)

Co-authored-by: Taloth Saldono <Taloth@users.noreply.github.com>
This commit is contained in:
Robin Dadswell
2021-05-20 12:04:37 +01:00
committed by GitHub
parent 74eee38aad
commit f85235d214
6 changed files with 52 additions and 1 deletions

View File

@@ -10,6 +10,15 @@
width: 100%; width: 100%;
} }
.commandName {
display: inline-block;
min-width: 220px;
}
.userAgent {
color: #b0b0b0;
}
.queued, .queued,
.started, .started,
.ended { .ended {

View File

@@ -157,6 +157,7 @@ class QueuedTaskRow extends Component {
status, status,
duration, duration,
message, message,
clientUserAgent,
longDateFormat, longDateFormat,
timeFormat, timeFormat,
onCancelPress onCancelPress
@@ -192,7 +193,18 @@ class QueuedTaskRow extends Component {
</span> </span>
</TableRowCell> </TableRowCell>
<TableRowCell>{commandName}</TableRowCell> <TableRowCell>
<span className={styles.commandName}>
{commandName}
</span>
{
clientUserAgent ?
<span className={styles.userAgent} title="User-Agent provided by the app that called the API">
from: {clientUserAgent}
</span> :
null
}
</TableRowCell>
<TableRowCell <TableRowCell
className={styles.queued} className={styles.queued}
@@ -256,6 +268,7 @@ QueuedTaskRow.propTypes = {
status: PropTypes.string.isRequired, status: PropTypes.string.isRequired,
duration: PropTypes.string, duration: PropTypes.string,
message: PropTypes.string, message: PropTypes.string,
clientUserAgent: PropTypes.string,
showRelativeDates: PropTypes.bool.isRequired, showRelativeDates: PropTypes.bool.isRequired,
shortDateFormat: PropTypes.string.isRequired, shortDateFormat: PropTypes.string.isRequired,
longDateFormat: PropTypes.string.isRequired, longDateFormat: PropTypes.string.isRequired,

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;
}
}
}

View File

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

View File

@@ -62,6 +62,7 @@ namespace Prowlarr.Api.V1.Commands
command.Trigger = CommandTrigger.Manual; command.Trigger = CommandTrigger.Manual;
command.SuppressMessages = !command.SendUpdatesToClient; command.SuppressMessages = !command.SendUpdatesToClient;
command.SendUpdatesToClient = true; command.SendUpdatesToClient = true;
command.ClientUserAgent = Request.Headers["User-Agent"];
var trackedCommand = _commandQueueManager.Push(command, CommandPriority.Normal, CommandTrigger.Manual); var trackedCommand = _commandQueueManager.Push(command, CommandPriority.Normal, CommandTrigger.Manual);
return Created(trackedCommand.Id); return Created(trackedCommand.Id);

View File

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