From d7f63abe011b4b9f073cf3f1ab576e6528cf513a Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 11 Jun 2019 22:44:49 -0400 Subject: [PATCH] New: Option to use HTTPS with Emby --- .../Notifications/MediaBrowser/MediaBrowserProxy.cs | 3 ++- .../MediaBrowser/MediaBrowserSettings.cs | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs index 6d51479b7..9bfdf948f 100644 --- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs +++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs @@ -88,7 +88,8 @@ namespace NzbDrone.Core.Notifications.Emby private HttpRequest BuildRequest(string path, MediaBrowserSettings settings) { - var url = string.Format(@"http://{0}/mediabrowser", settings.Address); + var scheme = settings.UseSsl ? "https" : "http"; + var url = $@"{scheme}://{settings.Address}/mediabrowser"; return new HttpRequestBuilder(url).Resource(path).Build(); } diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs index cf2ffe8ab..5669c77b6 100644 --- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs +++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using Newtonsoft.Json; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; @@ -30,13 +30,16 @@ namespace NzbDrone.Core.Notifications.Emby [FieldDefinition(1, Label = "Port")] public int Port { get; set; } - [FieldDefinition(2, Label = "API Key")] + [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Connect to Emby over HTTPS instead of HTTP")] + public bool UseSsl { get; set; } + + [FieldDefinition(3, Label = "API Key")] public string ApiKey { get; set; } - [FieldDefinition(3, Label = "Send Notifications", HelpText = "Have MediaBrowser send notfications to configured providers", Type = FieldType.Checkbox)] + [FieldDefinition(4, Label = "Send Notifications", HelpText = "Have MediaBrowser send notfications to configured providers", Type = FieldType.Checkbox)] public bool Notify { get; set; } - [FieldDefinition(4, Label = "Update Library", HelpText = "Update Library on Download & Rename?", Type = FieldType.Checkbox)] + [FieldDefinition(5, Label = "Update Library", HelpText = "Update Library on Download & Rename?", Type = FieldType.Checkbox)] public bool UpdateLibrary { get; set; } [JsonIgnore]