diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 554d63ac11..b05a1bd209 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -71,6 +71,7 @@ namespace MediaBrowser.Api
_config.Configuration.DisableStartupScan = true;
_config.Configuration.EnableUserViews = true;
_config.Configuration.EnableDateLastRefresh = true;
+ _config.Configuration.MergeMetadataAndImagesByName = true;
_config.SaveConfiguration();
}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 77bce5cbd3..91e20c3e09 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -180,6 +180,8 @@ namespace MediaBrowser.Model.Configuration
/// The dashboard source path.
public string DashboardSourcePath { get; set; }
+ public bool MergeMetadataAndImagesByName { get; set; }
+
///
/// Gets or sets the image saving convention.
///
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 6b668da47b..d7df37332a 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -35,6 +35,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
: base(applicationPaths, logManager, xmlSerializer, fileSystem)
{
+ UpdateItemsByNamePath();
UpdateMetadataPath();
}
@@ -72,6 +73,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
///
protected override void OnConfigurationUpdated()
{
+ UpdateItemsByNamePath();
UpdateMetadataPath();
base.OnConfigurationUpdated();
@@ -84,6 +86,19 @@ namespace MediaBrowser.Server.Implementations.Configuration
UpdateTranscodingTempPath();
}
+ ///
+ /// Updates the items by name path.
+ ///
+ private void UpdateItemsByNamePath()
+ {
+ if (!Configuration.MergeMetadataAndImagesByName)
+ {
+ ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ?
+ null :
+ Configuration.ItemsByNamePath;
+ }
+ }
+
///
/// Updates the metadata path.
///