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

deprecate options

Browse Source 
Conflicts:
	MediaBrowser.Api/StartupWizardService.cs
This commit is contained in:
Luke Pulverenti 2016-01-26 13:19:05 -05:00
parent fae18c57bc
commit c81388689e
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,9 +180,6 @@ 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; }
public bool EnableStandaloneMetadata { get; set; }
/// <summary> /// <summary>
/// Gets or sets the image saving convention. /// Gets or sets the image saving convention.
/// </summary> /// </summary>

23
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) 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>
@ -121,22 +106,14 @@ namespace MediaBrowser.Server.Implementations.Configuration
((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath; ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;
if (Configuration.MergeMetadataAndImagesByName)
{
((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath; ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath;
} }
}
private string GetInternalMetadataPath() private string GetInternalMetadataPath()
{
if (Configuration.EnableStandaloneMetadata)
{ {
return Path.Combine(ApplicationPaths.ProgramDataPath, "metadata"); return Path.Combine(ApplicationPaths.ProgramDataPath, "metadata");
} }
return null;
}
/// <summary> /// <summary>
/// Updates the transcoding temporary path. /// Updates the transcoding temporary path.
/// </summary> /// </summary>