pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use .Distinct on assembly

This commit is contained in:
David Ullmer 2020-08-31 17:53:55 +02:00
parent 025ee2163f
commit 7f79f2ee0e
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -1387,15 +1387,17 @@ namespace Emby.Server.Implementations
public IEnumerable<Assembly> GetApiPluginAssemblies() public IEnumerable<Assembly> GetApiPluginAssemblies()
{ {
var types = _allConcreteTypes var assemblies = _allConcreteTypes
.Where(i => typeof(ControllerBase).IsAssignableFrom(i)) .Where(i => typeof(ControllerBase).IsAssignableFrom(i))
.Select(i => i.Assembly)
.Distinct(); .Distinct();
foreach (var type in types) foreach (var assembly in assemblies)
{ {
Logger.LogDebug("Found API endpoints in plugin {name}", type.Assembly.FullName); Logger.LogDebug("Found API endpoints in plugin {name}", assembly.FullName);
yield return type.Assembly;
} }
return assemblies;
} }
public virtual void LaunchUrl(string url) public virtual void LaunchUrl(string url)

6
Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
View File

@ -136,9 +136,9 @@ namespace Jellyfin.Server.Extensions
/// </summary> /// </summary>
/// <param name="serviceCollection">The service collection.</param> /// <param name="serviceCollection">The service collection.</param>
/// <param name="baseUrl">The base url for the API.</param> /// <param name="baseUrl">The base url for the API.</param>
/// <param name="applicationHost">The application host.</param> /// <param name="pluginAssemblies">An IEnumberable containing all plugin assemblies with API controllers.</param>
/// <returns>The MVC builder.</returns> /// <returns>The MVC builder.</returns>
public static IMvcBuilder AddJellyfinApi(this IServiceCollection serviceCollection, string baseUrl, IApplicationHost applicationHost) public static IMvcBuilder AddJellyfinApi(this IServiceCollection serviceCollection, string baseUrl, IEnumerable<Assembly> pluginAssemblies)
{ {
IMvcBuilder mvcBuilder = serviceCollection IMvcBuilder mvcBuilder = serviceCollection
.AddCors(options => .AddCors(options =>
@ -179,7 +179,7 @@ namespace Jellyfin.Server.Extensions
options.JsonSerializerOptions.PropertyNamingPolicy = jsonOptions.PropertyNamingPolicy; options.JsonSerializerOptions.PropertyNamingPolicy = jsonOptions.PropertyNamingPolicy;
}); });
foreach (Assembly pluginAssembly in applicationHost.GetApiPluginAssemblies()) foreach (Assembly pluginAssembly in pluginAssemblies)
{ {
mvcBuilder.AddApplicationPart(pluginAssembly); mvcBuilder.AddApplicationPart(pluginAssembly);
} }

2
Jellyfin.Server/Startup.cs
View File

@ -41,7 +41,7 @@ namespace Jellyfin.Server
{ {
services.AddResponseCompression(); services.AddResponseCompression();
services.AddHttpContextAccessor(); services.AddHttpContextAccessor();
services.AddJellyfinApi(_serverConfigurationManager.Configuration.BaseUrl.TrimStart('/'), _applicationHost); services.AddJellyfinApi(_serverConfigurationManager.Configuration.BaseUrl.TrimStart('/'), _applicationHost.GetApiPluginAssemblies());
services.AddJellyfinApiSwagger(); services.AddJellyfinApiSwagger();