Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

add back MergeMetadataAndImagesByName

Browse Source 
Conflicts:
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
This commit is contained in:
Luke Pulverenti 2016-01-27 01:31:31 -05:00
parent 51cd5e90b0
commit 106a2f3e1a
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Api/StartupWizardService.cs
View File

@ -71,6 +71,7 @@ namespace MediaBrowser.Api
_config.Configuration.DisableStartupScan = true; _config.Configuration.DisableStartupScan = true;
_config.Configuration.EnableUserViews = true; _config.Configuration.EnableUserViews = true;
_config.Configuration.EnableDateLastRefresh = true; _config.Configuration.EnableDateLastRefresh = true;
_config.Configuration.MergeMetadataAndImagesByName = true;
_config.SaveConfiguration(); _config.SaveConfiguration();
} }

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

@ -180,6 +180,8 @@ namespace MediaBrowser.Model.Configuration
/// <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.
/// </summary> /// </summary>

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

@ -35,6 +35,7 @@ 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();
} }
@ -72,6 +73,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
/// </summary> /// </summary>
protected override void OnConfigurationUpdated() protected override void OnConfigurationUpdated()
{ {
UpdateItemsByNamePath();
UpdateMetadataPath(); UpdateMetadataPath();
base.OnConfigurationUpdated(); base.OnConfigurationUpdated();
@ -84,6 +86,19 @@ 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>