michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

deprecate merge setting

Browse Source
This commit is contained in:
Luke Pulverenti 2016-02-05 11:04:18 -05:00
parent b94dc9d31a
commit 32013f5ae5
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Api/StartupWizardService.cs
View File

@ -68,7 +68,6 @@ namespace MediaBrowser.Api
_config.Configuration.EnableLocalizedGuids = true;
_config.Configuration.EnableCustomPathSubFolders = true;
_config.Configuration.EnableDateLastRefresh = true;
_config.Configuration.MergeMetadataAndImagesByName = true;
_config.SaveConfiguration();
}

2
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -161,8 +161,6 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
/// <value>The dashboard source path.</value>
public string DashboardSourcePath { get; set; }
public bool MergeMetadataAndImagesByName { get; set; }
/// <summary>
/// Gets or sets the image saving convention.

15
MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@ -35,7 +35,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
: base(applicationPaths, logManager, xmlSerializer, fileSystem)
{
UpdateItemsByNamePath();
UpdateMetadataPath();
}
@ -73,7 +72,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
/// </summary>
protected override void OnConfigurationUpdated()
{
UpdateItemsByNamePath();
UpdateMetadataPath();
base.OnConfigurationUpdated();
@ -86,19 +84,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
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>
/// Updates the metadata path.
/// </summary>