github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
remove deprecated settings from server config

(cherry picked from commit 542401c7f4)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dkanada 2021-02-13 10:52:50 +09:00 • committed by Joshua M. Boniface
parent d53120602c
commit b2a8fd82d8
3 changed files with 1 additions and 15 deletions
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

@ -300,9 +300,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; }
} }
} }