Merge remote-tracking branch 'upstream/master' into use-development-exception-page

1 files changed, 17 insertions, 26 deletions

diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index a71d685fb..133a35527 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -135,20 +135,6 @@ namespace MediaBrowser.WebDashboard.Api
             _serverConfigurationManager = serverConfigurationManager;
             _fileSystem = fileSystem;
             _resultFactory = resultFactory;
-
-            // If hosting the web client, validate the client content path
-            if (appConfig.HostWebClient())
-            {
-                string webContentPath = DashboardUIPath;
-                if (!Directory.Exists(webContentPath) || !Directory.GetFiles(webContentPath).Any())
-                {
-                    throw new InvalidOperationException(
-                        "The server is expected to host the web client, but the provided content directory is either " +
-                        $"invalid or empty: {webContentPath}. If you do not want to host the web client with the " +
-                        "server, you may set the '--nowebclient' command line flag, or set" +
-                        $"'{Controller.Extensions.ConfigurationExtensions.HostWebClientKey}=false' in your config settings.");
-                }
-            }
         }
 
         /// <summary>
@@ -161,22 +147,27 @@ namespace MediaBrowser.WebDashboard.Api
         /// Gets the path of the directory containing the static web interface content, or null if the server is not
         /// hosting the web client.
         /// </summary>
-        public string DashboardUIPath
+        public string DashboardUIPath => GetDashboardUIPath(_appConfig, _serverConfigurationManager);
+
+        /// <summary>
+        /// Gets the path of the directory containing the static web interface content.
+        /// </summary>
+        /// <param name="appConfig">The app configuration.</param>
+        /// <param name="serverConfigManager">The server configuration manager.</param>
+        /// <returns>The directory path, or null if the server is not hosting the web client.</returns>
+        public static string GetDashboardUIPath(IConfiguration appConfig, IServerConfigurationManager serverConfigManager)
         {
-            get
+            if (!appConfig.HostWebClient())
             {
-                if (!_appConfig.HostWebClient())
-                {
-                    return null;
-                }
-
-                if (!string.IsNullOrEmpty(_serverConfigurationManager.Configuration.DashboardSourcePath))
-                {
-                    return _serverConfigurationManager.Configuration.DashboardSourcePath;
-                }
+                return null;
+            }
 
-                return _serverConfigurationManager.ApplicationPaths.WebPath;
+            if (!string.IsNullOrEmpty(serverConfigManager.Configuration.DashboardSourcePath))
+            {
+                return serverConfigManager.Configuration.DashboardSourcePath;
             }
+
+            return serverConfigManager.ApplicationPaths.WebPath;
         }
 
         [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]