From 75aa8af9d29c3d832214fcde4d75c45ee61c8dea Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 22 Oct 2017 02:51:09 -0400
Subject: [PATCH] Check for valid URL in MetadataSource, Handle trailing slash

---
 src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs | 3 ++-
 src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs b/src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs
index 3a9c217a4..9292c4842 100644
--- a/src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs
+++ b/src/Lidarr.Api.V3/Config/MetadataProviderConfigModule.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using System.Reflection;
 using NzbDrone.Core.Configuration;
 using Lidarr.Http;
+using NzbDrone.Core.Validation;
 
 namespace Lidarr.Api.V3.Config
 {
@@ -10,7 +11,7 @@ namespace Lidarr.Api.V3.Config
         public MetadataProviderConfigModule(IConfigService configService)
             : base(configService)
         {
-
+            SharedValidator.RuleFor(c => c.MetadataSource).IsValidUrl();
         }
 
         protected override MetadataProviderConfigResource ToResource(IConfigService model)
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
index 270b8ab0e..5eb7c1c0b 100644
--- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
@@ -287,7 +287,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
         {
             if (_configService.MetadataSource.IsNotNullOrWhiteSpace())
             {
-                customerRequestBuilder = new HttpRequestBuilder(_configService.MetadataSource + "{route}/").CreateFactory();
+                customerRequestBuilder = new HttpRequestBuilder(_configService.MetadataSource.TrimEnd("/") + "/{route}/").CreateFactory();
             }
             else
             {