From e126c45fb36ca16389d57f94a1cc1fb09c156f60 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sat, 24 Aug 2019 22:43:33 +0200 Subject: [PATCH] Added BuildInfo.AppName to centralize 'Sonarr' --- src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs | 2 ++ src/NzbDrone.Common/Http/HttpProvider.cs | 2 +- src/NzbDrone.Common/Http/UserAgentBuilder.cs | 4 ++-- src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs | 3 ++- src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs | 3 ++- src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs | 4 ++-- .../Notifications/Plex/PlexTv/PlexTvService.cs | 6 +++--- .../Notifications/Plex/Server/PlexServerProxy.cs | 4 ++-- src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs | 3 ++- src/NzbDrone.Core/Rest/RestClientFactory.cs | 2 +- src/NzbDrone.Host/Owin/OwinServiceProvider.cs | 3 ++- 11 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs index 84a1d3435..45869e636 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs @@ -27,6 +27,8 @@ namespace NzbDrone.Common.EnvironmentInfo Release = $"{Version}-{Branch}"; } + public static string AppName { get; } = "Sonarr"; + public static Version Version { get; } public static String Branch { get; } public static string Release { get; } diff --git a/src/NzbDrone.Common/Http/HttpProvider.cs b/src/NzbDrone.Common/Http/HttpProvider.cs index e09fbf1c6..a61ac8a14 100644 --- a/src/NzbDrone.Common/Http/HttpProvider.cs +++ b/src/NzbDrone.Common/Http/HttpProvider.cs @@ -24,7 +24,7 @@ namespace NzbDrone.Common.Http public HttpProvider(Logger logger) { _logger = logger; - _userAgent = string.Format("Sonarr {0}", BuildInfo.Version); + _userAgent = $"{BuildInfo.AppName}/{BuildInfo.Version.ToString(2)}"; ServicePointManager.Expect100Continue = false; } diff --git a/src/NzbDrone.Common/Http/UserAgentBuilder.cs b/src/NzbDrone.Common/Http/UserAgentBuilder.cs index 5d3dc9644..525b8ee0b 100644 --- a/src/NzbDrone.Common/Http/UserAgentBuilder.cs +++ b/src/NzbDrone.Common/Http/UserAgentBuilder.cs @@ -33,8 +33,8 @@ namespace NzbDrone.Common.Http var osVersion = osInfo.Version?.ToLower(); - _userAgent = $"Sonarr/{BuildInfo.Version} ({osName} {osVersion})"; - _userAgentSimplified = $"Sonarr/{BuildInfo.Version.ToString(2)}"; + _userAgent = $"{BuildInfo.AppName}/{BuildInfo.Version} ({osName} {osVersion})"; + _userAgentSimplified = $"{BuildInfo.AppName}/{BuildInfo.Version.ToString(2)}"; } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs index 677e30c8e..c091b5195 100644 --- a/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Extensions; using NzbDrone.Common.Http; using NzbDrone.Core.IndexerSearch.Definitions; @@ -114,7 +115,7 @@ namespace NzbDrone.Core.Indexers.Rarbg requestBuilder.AddQueryParam("limit", "100"); requestBuilder.AddQueryParam("token", _tokenProvider.GetToken(Settings)); requestBuilder.AddQueryParam("format", "json_extended"); - requestBuilder.AddQueryParam("app_id", "Sonarr"); + requestBuilder.AddQueryParam("app_id", BuildInfo.AppName); yield return new IndexerRequest(requestBuilder.Build()); } diff --git a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs index 61cd7e663..d4028d595 100644 --- a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs +++ b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs @@ -4,6 +4,7 @@ using FluentValidation.Results; using NLog; using RestSharp; using NzbDrone.Core.Rest; +using NzbDrone.Common.EnvironmentInfo; namespace NzbDrone.Core.Notifications.Boxcar { @@ -75,7 +76,7 @@ namespace NzbDrone.Core.Notifications.Boxcar request.AddParameter("user_credentials", settings.Token); request.AddParameter("notification[title]", title); request.AddParameter("notification[long_message]", message); - request.AddParameter("notification[source_name]", "Sonarr"); + request.AddParameter("notification[source_name]", BuildInfo.AppName); request.AddParameter("notification[icon_url]", "https://raw.githubusercontent.com/Sonarr/Sonarr/7818f0c59b787312f0bcbc5c0eafc3c9dd7e5451/Logo/64.png"); client.ExecuteAndValidate(request); diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs b/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs index 18e4f6608..c4fafe006 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs @@ -43,10 +43,10 @@ namespace NzbDrone.Core.Notifications.Plex.PlexTv var requestBuilder = new HttpRequestBuilder("https://plex.tv") .Accept(HttpAccept.Json) .AddQueryParam("X-Plex-Client-Identifier", clientIdentifier) - .AddQueryParam("X-Plex-Product", "Sonarr") + .AddQueryParam("X-Plex-Product", BuildInfo.AppName) .AddQueryParam("X-Plex-Platform", "Windows") .AddQueryParam("X-Plex-Platform-Version", "7") - .AddQueryParam("X-Plex-Device-Name", "Sonarr") + .AddQueryParam("X-Plex-Device-Name", BuildInfo.AppName) .AddQueryParam("X-Plex-Version", BuildInfo.Version.ToString()); return requestBuilder; diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvService.cs b/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvService.cs index 6751e7a5e..8866775c6 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvService.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvService.cs @@ -31,10 +31,10 @@ namespace NzbDrone.Core.Notifications.Plex.PlexTv var requestBuilder = new HttpRequestBuilder("https://plex.tv/api/v2/pins") .Accept(HttpAccept.Json) .AddQueryParam("X-Plex-Client-Identifier", clientIdentifier) - .AddQueryParam("X-Plex-Product", "Sonarr") + .AddQueryParam("X-Plex-Product", BuildInfo.AppName) .AddQueryParam("X-Plex-Platform", "Windows") .AddQueryParam("X-Plex-Platform-Version", "7") - .AddQueryParam("X-Plex-Device-Name", "Sonarr") + .AddQueryParam("X-Plex-Device-Name", BuildInfo.AppName) .AddQueryParam("X-Plex-Version", BuildInfo.Version.ToString()) .AddQueryParam("strong", true); @@ -57,7 +57,7 @@ namespace NzbDrone.Core.Notifications.Plex.PlexTv .AddQueryParam("clientID", clientIdentifier) .AddQueryParam("forwardUrl", callbackUrl) .AddQueryParam("code", pinCode) - .AddQueryParam("context[device][product]", "Sonarr") + .AddQueryParam("context[device][product]", BuildInfo.AppName) .AddQueryParam("context[device][platform]", "Windows") .AddQueryParam("context[device][platformVersion]", "7") .AddQueryParam("context[device][version]", BuildInfo.Version.ToString()); diff --git a/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerProxy.cs b/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerProxy.cs index f5ec3b51a..79c27ba7a 100644 --- a/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerProxy.cs +++ b/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerProxy.cs @@ -155,10 +155,10 @@ namespace NzbDrone.Core.Notifications.Plex.Server var requestBuilder = new HttpRequestBuilder($"{scheme}://{settings.Host}:{settings.Port}") .Accept(HttpAccept.Json) .AddQueryParam("X-Plex-Client-Identifier", _configService.PlexClientIdentifier) - .AddQueryParam("X-Plex-Product", "Sonarr") + .AddQueryParam("X-Plex-Product", BuildInfo.AppName) .AddQueryParam("X-Plex-Platform", "Windows") .AddQueryParam("X-Plex-Platform-Version", "7") - .AddQueryParam("X-Plex-Device-Name", "Sonarr") + .AddQueryParam("X-Plex-Device-Name", BuildInfo.AppName) .AddQueryParam("X-Plex-Version", BuildInfo.Version.ToString()); if (settings.AuthToken.IsNotNullOrWhiteSpace()) diff --git a/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs b/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs index 7b70a8b6e..738ace909 100644 --- a/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs +++ b/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs @@ -1,6 +1,7 @@ using System; using FluentValidation.Results; using NLog; +using NzbDrone.Common.EnvironmentInfo; using Prowlin; namespace NzbDrone.Core.Notifications.Prowl @@ -26,7 +27,7 @@ namespace NzbDrone.Core.Notifications.Prowl { var notification = new Prowlin.Notification { - Application = "Sonarr", + Application = BuildInfo.AppName, Description = message, Event = title, Priority = priority, diff --git a/src/NzbDrone.Core/Rest/RestClientFactory.cs b/src/NzbDrone.Core/Rest/RestClientFactory.cs index f0259e54e..cc657c4b6 100644 --- a/src/NzbDrone.Core/Rest/RestClientFactory.cs +++ b/src/NzbDrone.Core/Rest/RestClientFactory.cs @@ -9,7 +9,7 @@ namespace NzbDrone.Core.Rest { var restClient = new RestClient(baseUrl) { - UserAgent = $"Sonarr/{BuildInfo.Version} ({OsInfo.Os})" + UserAgent = $"{BuildInfo.AppName}/{BuildInfo.Version} ({OsInfo.Os})" }; diff --git a/src/NzbDrone.Host/Owin/OwinServiceProvider.cs b/src/NzbDrone.Host/Owin/OwinServiceProvider.cs index 792c4d12c..6eba2af27 100644 --- a/src/NzbDrone.Host/Owin/OwinServiceProvider.cs +++ b/src/NzbDrone.Host/Owin/OwinServiceProvider.cs @@ -8,6 +8,7 @@ using Microsoft.Owin.Hosting.Engine; using Microsoft.Owin.Hosting.Services; using Microsoft.Owin.Hosting.Tracing; using NLog; +using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Core.Configuration; using NzbDrone.Host.Owin.MiddleWare; using Owin; @@ -70,7 +71,7 @@ namespace NzbDrone.Host.Owin private void BuildApp(IAppBuilder appBuilder) { - appBuilder.Properties["host.AppName"] = "Sonarr"; + appBuilder.Properties["host.AppName"] = BuildInfo.AppName; foreach (var middleWare in _owinMiddleWares.OrderBy(c => c.Order)) {