From d437950ac30ee294ab275362abe711ae3c14ac32 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Wed, 11 Mar 2020 22:55:10 +0100
Subject: [PATCH] Parse config value correctly

---
 .../Extensions/ConfigurationExtensions.cs       | 17 +----------------
 .../MediaBrowser.Controller.csproj              |  1 +
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
index 9dbc1a243f..1a9ac09ee9 100644
--- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.Controller.Extensions
         /// <returns>The parsed config value.</returns>
         /// <exception cref="FormatException">The config value is not a valid bool string. See <see cref="bool.Parse(string)"/>.</exception>
         public static bool IsNoWebContent(this IConfiguration configuration)
-            => configuration.ParseBoolean(NoWebContentKey);
+            => configuration.GetValue<bool>(NoWebContentKey);
 
         /// <summary>
         /// Retrieves the FFmpeg probe size from the <see cref="IConfiguration" />.
@@ -48,20 +48,5 @@ namespace MediaBrowser.Controller.Extensions
         /// <returns>The FFmpeg analyse duration option.</returns>
         public static string GetFFmpegAnalyzeDuration(this IConfiguration configuration)
             => configuration[FfmpegAnalyzeDurationKey];
-
-        /// <summary>
-        /// Convert the specified configuration string value its <see cref="bool"/> equivalent.
-        /// </summary>
-        /// <param name="configuration">The configuration to retrieve and parse the setting from.</param>
-        /// <param name="key">The key to use to retrieve the string value from the configuration.</param>
-        /// <returns>The parsed boolean value.</returns>
-        /// <exception cref="FormatException">The config value is not a valid bool string. See <see cref="bool.Parse(string)"/>.</exception>
-        public static bool ParseBoolean(this IConfiguration configuration, string key)
-        {
-            string configValue = configuration[key];
-            return bool.TryParse(configValue, out bool result) ?
-                result :
-                throw new FormatException($"Invalid value for configuration option '{key}' (expected a boolean): {configValue}");
-        }
     }
 }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 88e9055e84..bcca9e4a18 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>