diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 06db1de74..6556807c4 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -68,6 +68,7 @@ namespace MediaBrowser.Api
_config.Configuration.EnableLocalizedGuids = true;
_config.Configuration.EnableCustomPathSubFolders = 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 81c1bd610..ced5210c5 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -162,6 +162,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.
///
@@ -211,6 +213,7 @@ namespace MediaBrowser.Model.Configuration
///
public ServerConfiguration()
{
+ MergeMetadataAndImagesByName = true;
Migrations = new string[] { };
ImageSavingConvention = ImageSavingConvention.Compatible;
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 1a5c35df8..8e934f348 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.
///