From 665b80f15c488d678562eeb6af66879dde408c38 Mon Sep 17 00:00:00 2001 From: Qstick Date: Wed, 8 Apr 2020 22:52:14 -0400 Subject: [PATCH] Convert Notifications from RestSharp to HttpClient --- .../Notifications/Boxcar/BoxcarProxy.cs | 36 ++++---- .../Notifications/Discord/DiscordProxy.cs | 3 +- .../Notifications/Gotify/GotifyException.cs | 18 ++++ .../Notifications/Gotify/GotifyProxy.cs | 35 +++++--- .../Gotify/InvalidResponseException.cs | 15 ---- .../Notifications/Growl/Growl.cs | 1 - .../Notifications/Join/JoinProxy.cs | 41 +++++----- .../MediaBrowser/MediaBrowserService.cs | 4 +- .../PushBullet/PushBulletProxy.cs | 75 +++++++++-------- .../Notifications/Pushover/PushoverProxy.cs | 35 ++++---- .../Notifications/Slack/SlackProxy.cs | 5 +- .../Notifications/Telegram/TelegramService.cs | 29 +++---- .../Notifications/Webhook/WebhookProxy.cs | 3 +- .../Notifications/Xbmc/XbmcJsonApiProxy.cs | 82 ++++++------------- 14 files changed, 183 insertions(+), 199 deletions(-) create mode 100644 src/NzbDrone.Core/Notifications/Gotify/GotifyException.cs delete mode 100644 src/NzbDrone.Core/Notifications/Gotify/InvalidResponseException.cs diff --git a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs index 2d61b7467..b25f3cea9 100644 --- a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs +++ b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Net; using FluentValidation.Results; using NLog; -using RestSharp; -using NzbDrone.Core.Rest; using NzbDrone.Common.EnvironmentInfo; +using NzbDrone.Common.Http; namespace NzbDrone.Core.Notifications.Boxcar { @@ -16,23 +15,21 @@ public interface IBoxcarProxy public class BoxcarProxy : IBoxcarProxy { - private readonly IRestClientFactory _restClientFactory; + private readonly IHttpClient _httpClient; private readonly Logger _logger; private const string URL = "https://new.boxcar.io/api/notifications"; - public BoxcarProxy(IRestClientFactory restClientFactory, Logger logger) + public BoxcarProxy(IHttpClient httpClient, Logger logger) { - _restClientFactory = restClientFactory; + _httpClient = httpClient; _logger = logger; } public void SendNotification(string title, string message, BoxcarSettings settings) { - var request = new RestRequest(Method.POST); - try { - SendNotification(title, message, request, settings); + ProcessNotification(title, message, settings); } catch (BoxcarException ex) { @@ -51,7 +48,7 @@ public ValidationFailure Test(BoxcarSettings settings) SendNotification(title, body, settings); return null; } - catch (RestException ex) + catch (HttpException ex) { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { @@ -69,21 +66,22 @@ public ValidationFailure Test(BoxcarSettings settings) } } - private void SendNotification(string title, string message, RestRequest request, BoxcarSettings settings) + private void ProcessNotification(string title, string message, BoxcarSettings settings) { try { - var client = _restClientFactory.BuildClient(URL); + var requestBuilder = new HttpRequestBuilder(URL).Post(); - request.AddParameter("user_credentials", settings.Token); - request.AddParameter("notification[title]", title); - request.AddParameter("notification[long_message]", message); - request.AddParameter("notification[source_name]", BuildInfo.AppName); - request.AddParameter("notification[icon_url]", "https://raw.githubusercontent.com/Sonarr/Sonarr/7818f0c59b787312f0bcbc5c0eafc3c9dd7e5451/Logo/64.png"); + var request = requestBuilder.AddFormParameter("user_credentials", settings.Token) + .AddFormParameter("notification[title]", title) + .AddFormParameter("notification[long_message]", message) + .AddFormParameter("notification[source_name]", BuildInfo.AppName) + .AddFormParameter("notification[icon_url]", "https://raw.githubusercontent.com/Sonarr/Sonarr/phantom-develop/Logo/64.png") + .Build(); - client.ExecuteAndValidate(request); + _httpClient.Post(request); } - catch (RestException ex) + catch (HttpException ex) { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { diff --git a/src/NzbDrone.Core/Notifications/Discord/DiscordProxy.cs b/src/NzbDrone.Core/Notifications/Discord/DiscordProxy.cs index 425364253..9bcbeb454 100644 --- a/src/NzbDrone.Core/Notifications/Discord/DiscordProxy.cs +++ b/src/NzbDrone.Core/Notifications/Discord/DiscordProxy.cs @@ -2,7 +2,6 @@ using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; using NzbDrone.Core.Notifications.Discord.Payloads; -using NzbDrone.Core.Rest; namespace NzbDrone.Core.Notifications.Discord { @@ -36,7 +35,7 @@ public void SendPayload(DiscordPayload payload, DiscordSettings settings) _httpClient.Execute(request); } - catch (RestException ex) + catch (HttpException ex) { _logger.Error(ex, "Unable to post payload {0}", payload); throw new DiscordException("Unable to post payload", ex); diff --git a/src/NzbDrone.Core/Notifications/Gotify/GotifyException.cs b/src/NzbDrone.Core/Notifications/Gotify/GotifyException.cs new file mode 100644 index 000000000..35547460a --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Gotify/GotifyException.cs @@ -0,0 +1,18 @@ +using System; +using NzbDrone.Common.Exceptions; + +namespace NzbDrone.Core.Notifications.Gotify +{ + public class GotifyException : NzbDroneException + { + public GotifyException(string message) + : base(message) + { + } + + public GotifyException(string message, Exception innerException, params object[] args) + : base(message, innerException, args) + { + } + } +} diff --git a/src/NzbDrone.Core/Notifications/Gotify/GotifyProxy.cs b/src/NzbDrone.Core/Notifications/Gotify/GotifyProxy.cs index 3aed74304..c61147296 100644 --- a/src/NzbDrone.Core/Notifications/Gotify/GotifyProxy.cs +++ b/src/NzbDrone.Core/Notifications/Gotify/GotifyProxy.cs @@ -1,5 +1,5 @@ -using RestSharp; -using NzbDrone.Core.Rest; +using System.Net; +using NzbDrone.Common.Http; namespace NzbDrone.Core.Notifications.Gotify { @@ -10,24 +10,35 @@ public interface IGotifyProxy public class GotifyProxy : IGotifyProxy { - private readonly IRestClientFactory _restClientFactory; + private readonly IHttpClient _httpClient; - public GotifyProxy(IRestClientFactory restClientFactory) + public GotifyProxy(IHttpClient httpClient) { - _restClientFactory = restClientFactory; + _httpClient = httpClient; } public void SendNotification(string title, string message, GotifySettings settings) { - var client = _restClientFactory.BuildClient(settings.Server); - var request = new RestRequest("message", Method.POST); + try + { + var request = new HttpRequestBuilder(settings.Server).Post() + .AddFormParameter("token", settings.AppToken) + .AddFormParameter("title", title) + .AddFormParameter("message", message) + .AddFormParameter("priority", settings.Priority) + .Build(); - request.AddQueryParameter("token", settings.AppToken); - request.AddParameter("title", title); - request.AddParameter("message", message); - request.AddParameter("priority", settings.Priority); + _httpClient.Post(request); + } + catch (HttpException ex) + { + if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) + { + throw new GotifyException("Unauthorized - AuthToken is invalid"); + } - client.ExecuteAndValidate(request); + throw new GotifyException("Unable to connect to Gotify. Status Code: {0}", ex); + } } } } diff --git a/src/NzbDrone.Core/Notifications/Gotify/InvalidResponseException.cs b/src/NzbDrone.Core/Notifications/Gotify/InvalidResponseException.cs deleted file mode 100644 index 0a4c20b4d..000000000 --- a/src/NzbDrone.Core/Notifications/Gotify/InvalidResponseException.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace NzbDrone.Core.Notifications.Gotify -{ - public class InvalidResponseException : Exception - { - public InvalidResponseException() - { - } - - public InvalidResponseException(string message) : base(message) - { - } - } -} diff --git a/src/NzbDrone.Core/Notifications/Growl/Growl.cs b/src/NzbDrone.Core/Notifications/Growl/Growl.cs index d3984f217..b46c1f7a9 100644 --- a/src/NzbDrone.Core/Notifications/Growl/Growl.cs +++ b/src/NzbDrone.Core/Notifications/Growl/Growl.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using FluentValidation.Results; using NzbDrone.Common.Extensions; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Growl { diff --git a/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs b/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs index 37da514be..9fe1a8298 100644 --- a/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs +++ b/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs @@ -4,6 +4,7 @@ using NzbDrone.Common.Extensions; using RestSharp; using NzbDrone.Core.Rest; +using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; namespace NzbDrone.Core.Notifications.Join @@ -16,23 +17,23 @@ public interface IJoinProxy public class JoinProxy : IJoinProxy { - private readonly IRestClientFactory _restClientFactory; + private readonly IHttpClient _httpClient; private readonly Logger _logger; private const string URL = "https://joinjoaomgcd.appspot.com/_ah/api/messaging/v1/sendPush?"; - public JoinProxy(IRestClientFactory restClientFactory, Logger logger) + public JoinProxy(IHttpClient httpClient, Logger logger) { - _restClientFactory = restClientFactory; + _httpClient = httpClient; _logger = logger; } public void SendNotification(string title, string message, JoinSettings settings) { - var request = new RestRequest(Method.GET); + var method = HttpMethod.GET; try { - SendNotification(title, message, request, settings); + SendNotification(title, message, method, settings); } catch (JoinException ex) { @@ -61,7 +62,7 @@ public ValidationFailure Test(JoinSettings settings) _logger.Error(ex, "Unable to send test Join message."); return new ValidationFailure("ApiKey", ex.Message); } - catch (RestException ex) + catch (HttpException ex) { _logger.Error(ex, "Unable to send test Join message. Server connection failed."); return new ValidationFailure("ApiKey", "Unable to connect to Join API. Please try again later."); @@ -73,32 +74,34 @@ public ValidationFailure Test(JoinSettings settings) } } - private void SendNotification(string title, string message, RestRequest request, JoinSettings settings) + private void SendNotification(string title, string message, HttpMethod method, JoinSettings settings) { - - var client = _restClientFactory.BuildClient(URL); + var requestBuilder = new HttpRequestBuilder(URL); if (settings.DeviceNames.IsNotNullOrWhiteSpace()) { - request.AddParameter("deviceNames", settings.DeviceNames); + requestBuilder.AddQueryParam("deviceNames", settings.DeviceNames); } else if (settings.DeviceIds.IsNotNullOrWhiteSpace()) { - request.AddParameter("deviceIds", settings.DeviceIds); + requestBuilder.AddQueryParam("deviceIds", settings.DeviceIds); } else { - request.AddParameter("deviceId", "group.all"); + requestBuilder.AddQueryParam("deviceId", "group.all"); } - request.AddParameter("apikey", settings.ApiKey); - request.AddParameter("title", title); - request.AddParameter("text", message); - request.AddParameter("icon", "https://cdn.rawgit.com/Sonarr/Sonarr/develop/Logo/256.png"); // Use the Sonarr logo. - request.AddParameter("smallicon", "https://cdn.rawgit.com/Sonarr/Sonarr/develop/Logo/96-Outline-White.png"); // 96x96px with outline at 88x88px on a transparent background. - request.AddParameter("priority", settings.Priority); + var request = requestBuilder.AddQueryParam("apikey", settings.ApiKey) + .AddQueryParam("title", title) + .AddQueryParam("text", message) + .AddQueryParam("icon", "https://cdn.rawgit.com/Sonarr/Sonarr/phantom-develop/Logo/256.png") // Use the Radarr logo. + .AddQueryParam("smallicon", "https://cdn.rawgit.com/Sonarr/Sonarr/phantom-develop/Logo/96-Outline-White.png") // 96x96px with outline at 88x88px on a transparent background. + .AddQueryParam("priority", settings.Priority) + .Build(); - var response = client.ExecuteAndValidate(request); + request.Method = method; + + var response = _httpClient.Execute(request); var res = Json.Deserialize(response.Content); if (res.success) return; diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs index 524fa65c6..70174fe34 100644 --- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs +++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs @@ -2,7 +2,7 @@ using System.Net; using FluentValidation.Results; using NLog; -using NzbDrone.Core.Rest; +using NzbDrone.Common.Http; using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Emby @@ -43,7 +43,7 @@ public ValidationFailure Test(MediaBrowserSettings settings) Notify(settings, "Test from Sonarr", "Success! MediaBrowser has been successfully configured!"); } - catch (RestException ex) + catch (HttpException ex) { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs index d916225e0..abe2c3f50 100644 --- a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs +++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs @@ -4,11 +4,9 @@ using System.Net; using FluentValidation.Results; using NLog; -using RestSharp; -using NzbDrone.Core.Rest; using NzbDrone.Common.Extensions; +using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; -using RestSharp.Authenticators; namespace NzbDrone.Core.Notifications.PushBullet { @@ -21,14 +19,14 @@ public interface IPushBulletProxy public class PushBulletProxy : IPushBulletProxy { - private readonly IRestClientFactory _restClientFactory; - private readonly Logger _logger; private const string PUSH_URL = "https://api.pushbullet.com/v2/pushes"; private const string DEVICE_URL = "https://api.pushbullet.com/v2/devices"; + private readonly IHttpClient _httpClient; + private readonly Logger _logger; - public PushBulletProxy(IRestClientFactory restClientFactory, Logger logger) + public PushBulletProxy(IHttpClient httpClient, Logger logger) { - _restClientFactory = restClientFactory; + _httpClient = httpClient; _logger = logger; } @@ -98,15 +96,18 @@ public List GetDevices(PushBulletSettings settings) { try { - var client = _restClientFactory.BuildClient(DEVICE_URL); - var request = new RestRequest(Method.GET); + var requestBuilder = new HttpRequestBuilder(DEVICE_URL); - client.Authenticator = new HttpBasicAuthenticator(settings.ApiKey, string.Empty); - var response = client.ExecuteAndValidate(request); + var request = requestBuilder.Build(); + + request.Method = HttpMethod.GET; + request.AddBasicAuthentication(settings.ApiKey, string.Empty); + + var response = _httpClient.Execute(request); return Json.Deserialize(response.Content).Devices; } - catch (RestException ex) + catch (HttpException ex) { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { @@ -127,7 +128,7 @@ public ValidationFailure Test(PushBulletSettings settings) SendNotification(title, body, settings); } - catch (RestException ex) + catch (HttpException ex) { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { @@ -147,51 +148,61 @@ public ValidationFailure Test(PushBulletSettings settings) return null; } - private RestRequest BuildDeviceRequest(string deviceId) + private HttpRequestBuilder BuildDeviceRequest(string deviceId) { - var request = new RestRequest(Method.POST); + var requestBuilder = new HttpRequestBuilder(PUSH_URL).Post(); long integerId; + if (deviceId.IsNullOrWhiteSpace()) + { + return requestBuilder; + } + if (long.TryParse(deviceId, out integerId)) { - request.AddParameter("device_id", integerId); + requestBuilder.AddFormParameter("device_id", integerId); } else { - request.AddParameter("device_iden", deviceId); + requestBuilder.AddFormParameter("device_iden", deviceId); } - return request; + return requestBuilder; } - private RestRequest BuildChannelRequest(string channelTag) + private HttpRequestBuilder BuildChannelRequest(string channelTag) { - var request = new RestRequest(Method.POST); - request.AddParameter("channel_tag", channelTag); + var requestBuilder = new HttpRequestBuilder(PUSH_URL).Post(); - return request; + if (channelTag.IsNotNullOrWhiteSpace()) + { + requestBuilder.AddFormParameter("channel_tag", channelTag); + } + + return requestBuilder; } - private void SendNotification(string title, string message, RestRequest request, PushBulletSettings settings) + private void SendNotification(string title, string message, HttpRequestBuilder requestBuilder, PushBulletSettings settings) { try { - var client = _restClientFactory.BuildClient(PUSH_URL); - - request.AddParameter("type", "note"); - request.AddParameter("title", title); - request.AddParameter("body", message); + requestBuilder.AddFormParameter("type", "note") + .AddFormParameter("title", title) + .AddFormParameter("body", message); if (settings.SenderId.IsNotNullOrWhiteSpace()) { - request.AddParameter("source_device_iden", settings.SenderId); + requestBuilder.AddFormParameter("source_device_iden", settings.SenderId); } - client.Authenticator = new HttpBasicAuthenticator(settings.ApiKey, string.Empty); - client.ExecuteAndValidate(request); + var request = requestBuilder.Build(); + + request.AddBasicAuthentication(settings.ApiKey, string.Empty); + + _httpClient.Execute(request); } - catch (RestException ex) + catch (HttpException ex) { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { diff --git a/src/NzbDrone.Core/Notifications/Pushover/PushoverProxy.cs b/src/NzbDrone.Core/Notifications/Pushover/PushoverProxy.cs index 81139377a..ced1e5896 100644 --- a/src/NzbDrone.Core/Notifications/Pushover/PushoverProxy.cs +++ b/src/NzbDrone.Core/Notifications/Pushover/PushoverProxy.cs @@ -2,8 +2,7 @@ using FluentValidation.Results; using NLog; using NzbDrone.Common.Extensions; -using RestSharp; -using NzbDrone.Core.Rest; +using NzbDrone.Common.Http; namespace NzbDrone.Core.Notifications.Pushover { @@ -15,40 +14,42 @@ public interface IPushoverProxy public class PushoverProxy : IPushoverProxy { - private readonly IRestClientFactory _restClientFactory; + private readonly IHttpClient _httpClient; private readonly Logger _logger; private const string URL = "https://api.pushover.net/1/messages.json"; - public PushoverProxy(IRestClientFactory restClientFactory, Logger logger) + public PushoverProxy(IHttpClient httpClient, Logger logger) { - _restClientFactory = restClientFactory; + _httpClient = httpClient; _logger = logger; } public void SendNotification(string title, string message, PushoverSettings settings) { - var client = _restClientFactory.BuildClient(URL); - var request = new RestRequest(Method.POST); - request.AddParameter("token", settings.ApiKey); - request.AddParameter("user", settings.UserKey); - request.AddParameter("device", string.Join(",", settings.Devices)); - request.AddParameter("title", title); - request.AddParameter("message", message); - request.AddParameter("priority", settings.Priority); + var requestBuilder = new HttpRequestBuilder(URL).Post(); + + requestBuilder.AddFormParameter("token", settings.ApiKey) + .AddFormParameter("user", settings.UserKey) + .AddFormParameter("device", string.Join(",", settings.Devices)) + .AddFormParameter("title", title) + .AddFormParameter("message", message) + .AddFormParameter("priority", settings.Priority); if ((PushoverPriority)settings.Priority == PushoverPriority.Emergency) { - request.AddParameter("retry", settings.Retry); - request.AddParameter("expire", settings.Expire); + requestBuilder.AddFormParameter("retry", settings.Retry); + requestBuilder.AddFormParameter("expire", settings.Expire); } if (!settings.Sound.IsNullOrWhiteSpace()) { - request.AddParameter("sound", settings.Sound); + requestBuilder.AddFormParameter("sound", settings.Sound); } - client.ExecuteAndValidate(request); + var request = requestBuilder.Build(); + + _httpClient.Post(request); } public ValidationFailure Test(PushoverSettings settings) diff --git a/src/NzbDrone.Core/Notifications/Slack/SlackProxy.cs b/src/NzbDrone.Core/Notifications/Slack/SlackProxy.cs index d612cf012..02075dad9 100644 --- a/src/NzbDrone.Core/Notifications/Slack/SlackProxy.cs +++ b/src/NzbDrone.Core/Notifications/Slack/SlackProxy.cs @@ -1,8 +1,7 @@ -using NLog; +using NLog; using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; using NzbDrone.Core.Notifications.Slack.Payloads; -using NzbDrone.Core.Rest; namespace NzbDrone.Core.Notifications.Slack { @@ -36,7 +35,7 @@ public void SendPayload(SlackPayload payload, SlackSettings settings) _httpClient.Execute(request); } - catch (RestException ex) + catch (HttpException ex) { _logger.Error(ex, "Unable to post payload {0}", payload); throw new SlackExeption("Unable to post payload", ex); diff --git a/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs b/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs index 8936e145e..1a4d5b7c5 100644 --- a/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs +++ b/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs @@ -1,13 +1,11 @@ using System; using System.Net; +using System.Web; using FluentValidation.Results; using NLog; using NzbDrone.Common.Extensions; +using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; -using NzbDrone.Common.Http.Proxy; -using RestSharp; -using NzbDrone.Core.Rest; -using System.Web; namespace NzbDrone.Core.Notifications.Telegram { @@ -19,13 +17,13 @@ public interface ITelegramProxy public class TelegramProxy : ITelegramProxy { - private readonly IRestClientFactory _restClientFactory; + private readonly IHttpClient _httpClient; private readonly Logger _logger; private const string URL = "https://api.telegram.org"; - public TelegramProxy(IRestClientFactory restClientFactory, Logger logger) + public TelegramProxy(IHttpClient httpClient, Logger logger) { - _restClientFactory = restClientFactory; + _httpClient = httpClient; _logger = logger; } @@ -33,17 +31,16 @@ public void SendNotification(string title, string message, TelegramSettings sett { //Format text to add the title before and bold using markdown var text = $"{HttpUtility.HtmlEncode(title)}\n{HttpUtility.HtmlEncode(message)}"; - var client = _restClientFactory.BuildClient(URL); - var request = new RestRequest("bot{token}/sendmessage", Method.POST); + var requestBuilder = new HttpRequestBuilder(URL).Resource("bot{token}/sendmessage").Post(); - request.AddUrlSegment("token", settings.BotToken); - request.AddParameter("chat_id", settings.ChatId); - request.AddParameter("parse_mode", "HTML"); - request.AddParameter("text", text); - request.AddParameter("disable_notification", settings.SendSilently); + var request = requestBuilder.SetSegment("token", settings.BotToken) + .AddFormParameter("chat_id", settings.ChatId) + .AddFormParameter("parse_mode", "HTML") + .AddFormParameter("text", text) + .Build(); - client.ExecuteAndValidate(request); + _httpClient.Post(request); } public ValidationFailure Test(TelegramSettings settings) @@ -63,7 +60,7 @@ public ValidationFailure Test(TelegramSettings settings) { return new ValidationFailure("Connection", $"{webException.Status.ToString()}: {webException.Message}"); } - else if (ex is RestException restException && restException.Response.StatusCode == HttpStatusCode.BadRequest) + else if (ex is Common.Http.HttpException restException && restException.Response.StatusCode == HttpStatusCode.BadRequest) { var error = Json.Deserialize(restException.Response.Content); var property = error.Description.ContainsIgnoreCase("chat not found") ? "ChatId" : "BotToken"; diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookProxy.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookProxy.cs index 5d5caaeab..8d998ac8d 100644 --- a/src/NzbDrone.Core/Notifications/Webhook/WebhookProxy.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookProxy.cs @@ -1,6 +1,5 @@ using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; -using NzbDrone.Core.Rest; using NzbDrone.Common.Extensions; namespace NzbDrone.Core.Notifications.Webhook @@ -37,7 +36,7 @@ public void SendWebhook(WebhookPayload body, WebhookSettings settings) } _httpClient.Execute(request); } - catch (RestException ex) + catch (HttpException ex) { throw new WebhookException("Unable to post to webhook: {0}", ex, ex.Message); } diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs index f3db41132..f8b4493dd 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; using NLog; using NzbDrone.Common.Extensions; +using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; using NzbDrone.Core.Notifications.Xbmc.Model; -using NzbDrone.Core.Rest; -using RestSharp; -using RestSharp.Authenticators; namespace NzbDrone.Core.Notifications.Xbmc { @@ -21,87 +19,66 @@ public interface IXbmcJsonApiProxy public class XbmcJsonApiProxy : IXbmcJsonApiProxy { - private readonly IRestClientFactory _restClientFactory; + private readonly IHttpClient _httpClient; private readonly Logger _logger; - public XbmcJsonApiProxy(IRestClientFactory restClientFactory, Logger logger) + public XbmcJsonApiProxy(IHttpClient httpClient, Logger logger) { - _restClientFactory = restClientFactory; + _httpClient = httpClient; _logger = logger; } public string GetJsonVersion(XbmcSettings settings) { - var request = new RestRequest(); - return ProcessRequest(request, settings, "JSONRPC.Version"); + return ProcessRequest(settings, "JSONRPC.Version"); } public void Notify(XbmcSettings settings, string title, string message) { - var request = new RestRequest(); - - var parameters = new Dictionary(); - parameters.Add("title", title); - parameters.Add("message", message); - parameters.Add("image", "https://raw.github.com/Sonarr/Sonarr/develop/Logo/64.png"); - parameters.Add("displaytime", settings.DisplayTime * 1000); - - ProcessRequest(request, settings, "GUI.ShowNotification", parameters); + ProcessRequest(settings, "GUI.ShowNotification", title, message, "https://raw.github.com/Sonarr/Sonarr/phantom-develop/Logo/64.png", settings.DisplayTime * 1000); } public string UpdateLibrary(XbmcSettings settings, string path) { - var request = new RestRequest(); - var parameters = new Dictionary(); - parameters.Add("directory", path); - - if (path.IsNullOrWhiteSpace()) - { - parameters = null; - } - - var response = ProcessRequest(request, settings, "VideoLibrary.Scan", parameters); + var response = ProcessRequest(settings, "VideoLibrary.Scan", path); return Json.Deserialize>(response).Result; } public void CleanLibrary(XbmcSettings settings) { - var request = new RestRequest(); - - ProcessRequest(request, settings, "VideoLibrary.Clean"); + ProcessRequest(settings, "VideoLibrary.Clean"); } public List GetActivePlayers(XbmcSettings settings) { - var request = new RestRequest(); - - var response = ProcessRequest(request, settings, "Player.GetActivePlayers"); + var response = ProcessRequest(settings, "Player.GetActivePlayers"); return Json.Deserialize(response).Result; } public List GetSeries(XbmcSettings settings) { - var request = new RestRequest(); - var parameters = new Dictionary(); - parameters.Add("properties", new[] { "file", "imdbnumber" }); - - var response = ProcessRequest(request, settings, "VideoLibrary.GetTvShows", parameters); + var response = ProcessRequest(settings, "VideoLibrary.GetMovies", new[] { "file", "imdbnumber" }); return Json.Deserialize(response).Result.TvShows; } - private string ProcessRequest(IRestRequest request, XbmcSettings settings, string method, Dictionary parameters = null) + private string ProcessRequest(XbmcSettings settings, string method, params object[] parameters) { - var client = BuildClient(settings); + var url = string.Format(@"http://{0}/jsonrpc", settings.Address); + var requestBuilder = new JsonRpcRequestBuilder(url, method, parameters); - request.Method = Method.POST; - request.RequestFormat = DataFormat.Json; - request.JsonSerializer = new JsonNetSerializer(); - request.AddBody(new { jsonrpc = "2.0", method = method, id = 10, @params = parameters }); + requestBuilder.LogResponseContent = true; - var response = client.ExecuteAndValidate(request); + var request = requestBuilder.Build(); + + if (!settings.Username.IsNullOrWhiteSpace()) + { + request.AddBasicAuthentication(settings.Username, settings.Password); + } + + var response = _httpClient.Execute(request); _logger.Trace("Response: {0}", response.Content); CheckForError(response); @@ -109,20 +86,7 @@ private string ProcessRequest(IRestRequest request, XbmcSettings settings, strin return response.Content; } - private IRestClient BuildClient(XbmcSettings settings) - { - var url = string.Format(@"http://{0}/jsonrpc", settings.Address); - var client = _restClientFactory.BuildClient(url); - - if (!settings.Username.IsNullOrWhiteSpace()) - { - client.Authenticator = new HttpBasicAuthenticator(settings.Username, settings.Password); - } - - return client; - } - - private void CheckForError(IRestResponse response) + private void CheckForError(HttpResponse response) { if (string.IsNullOrWhiteSpace(response.Content))