Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5216 from jellyfin/remove-old-settings

Browse Source 
remove deprecated settings from server config
This commit is contained in:
dkanada 2021-02-13 10:52:50 +09:00 committed by GitHub
commit 542401c7f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
View File

@ -79,11 +79,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
return new MusicArtist(); return new MusicArtist();
} }
if (_config.Configuration.EnableSimpleArtistDetection)
{
return null;
}
// Avoid mis-identifying top folders // Avoid mis-identifying top folders
if (args.Parent.IsRoot) if (args.Parent.IsRoot)
{ {

4
Jellyfin.Api/Controllers/PluginsController.cs
View File

@ -298,9 +298,7 @@ namespace Jellyfin.Api.Controllers
} }
var imagePath = Path.Combine(plugin.Path, plugin.Manifest.ImagePath ?? string.Empty); var imagePath = Path.Combine(plugin.Path, plugin.Manifest.ImagePath ?? string.Empty);
if (((ServerConfiguration)_config.CommonConfiguration).DisablePluginImages if (plugin.Manifest.ImagePath == null || !System.IO.File.Exists(imagePath))
|| plugin.Manifest.ImagePath == null
|| !System.IO.File.Exists(imagePath))
{ {
return NotFound(); return NotFound();
} }

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

@ -418,8 +418,6 @@ namespace MediaBrowser.Model.Configuration
public PathSubstitution[] PathSubstitutions { get; set; } = Array.Empty<PathSubstitution>(); public PathSubstitution[] PathSubstitutions { get; set; } = Array.Empty<PathSubstitution>();
public bool EnableSimpleArtistDetection { get; set; } = false;
public string[] UninstalledPlugins { get; set; } = Array.Empty<string>(); public string[] UninstalledPlugins { get; set; } = Array.Empty<string>();
/// <summary> /// <summary>
@ -461,10 +459,5 @@ namespace MediaBrowser.Model.Configuration
/// Gets or sets a value indicating whether older plugins should automatically be deleted from the plugin folder. /// Gets or sets a value indicating whether older plugins should automatically be deleted from the plugin folder.
/// </summary> /// </summary>
public bool RemoveOldPlugins { get; set; } public bool RemoveOldPlugins { get; set; }
/// <summary>
/// Gets or sets a value indicating whether plugin image should be disabled.
/// </summary>
public bool DisablePluginImages { get; set; }
} }
} }