deprecate merge setting
This commit is contained in:
parent
b94dc9d31a
commit
32013f5ae5
|
@ -68,7 +68,6 @@ namespace MediaBrowser.Api
|
||||||
_config.Configuration.EnableLocalizedGuids = true;
|
_config.Configuration.EnableLocalizedGuids = true;
|
||||||
_config.Configuration.EnableCustomPathSubFolders = true;
|
_config.Configuration.EnableCustomPathSubFolders = true;
|
||||||
_config.Configuration.EnableDateLastRefresh = true;
|
_config.Configuration.EnableDateLastRefresh = true;
|
||||||
_config.Configuration.MergeMetadataAndImagesByName = true;
|
|
||||||
_config.SaveConfiguration();
|
_config.SaveConfiguration();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -161,8 +161,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The dashboard source path.</value>
|
/// <value>The dashboard source path.</value>
|
||||||
public string DashboardSourcePath { get; set; }
|
public string DashboardSourcePath { get; set; }
|
||||||
|
|
||||||
public bool MergeMetadataAndImagesByName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the image saving convention.
|
/// Gets or sets the image saving convention.
|
||||||
|
|
|
@ -35,7 +35,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
|
||||||
public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
|
public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
|
||||||
: base(applicationPaths, logManager, xmlSerializer, fileSystem)
|
: base(applicationPaths, logManager, xmlSerializer, fileSystem)
|
||||||
{
|
{
|
||||||
UpdateItemsByNamePath();
|
|
||||||
UpdateMetadataPath();
|
UpdateMetadataPath();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,7 +72,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void OnConfigurationUpdated()
|
protected override void OnConfigurationUpdated()
|
||||||
{
|
{
|
||||||
UpdateItemsByNamePath();
|
|
||||||
UpdateMetadataPath();
|
UpdateMetadataPath();
|
||||||
|
|
||||||
base.OnConfigurationUpdated();
|
base.OnConfigurationUpdated();
|
||||||
|
@ -86,19 +84,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
|
||||||
UpdateTranscodingTempPath();
|
UpdateTranscodingTempPath();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Updates the items by name path.
|
|
||||||
/// </summary>
|
|
||||||
private void UpdateItemsByNamePath()
|
|
||||||
{
|
|
||||||
if (!Configuration.MergeMetadataAndImagesByName)
|
|
||||||
{
|
|
||||||
((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ?
|
|
||||||
null :
|
|
||||||
Configuration.ItemsByNamePath;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Updates the metadata path.
|
/// Updates the metadata path.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user