From 2fdc01644e2886eaea6a5b1753b45fa643da7fe8 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Fri, 3 Jan 2020 20:34:33 +0300 Subject: [PATCH] Refactoring --- .../Extensions/AssemblyExtensions.cs | 35 +++++++++ .../OqtaneServiceCollectionExtensions.cs | 73 +++++++------------ 2 files changed, 62 insertions(+), 46 deletions(-) create mode 100644 Oqtane.Server/Extensions/AssemblyExtensions.cs diff --git a/Oqtane.Server/Extensions/AssemblyExtensions.cs b/Oqtane.Server/Extensions/AssemblyExtensions.cs new file mode 100644 index 00000000..7c3bb924 --- /dev/null +++ b/Oqtane.Server/Extensions/AssemblyExtensions.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace System.Reflection +{ + public static class AssemblyExtensions + { + public static IEnumerable GetInterfaces(this Assembly assembly) + { + if (assembly is null) + { + throw new ArgumentNullException(nameof(assembly)); + } + + return assembly.GetTypes(typeof(TInterfaceType)); + } + + public static IEnumerable GetTypes(this Assembly assembly, Type interfaceType) + { + if (assembly is null) + { + throw new ArgumentNullException(nameof(assembly)); + } + + if (interfaceType is null) + { + throw new ArgumentNullException(nameof(interfaceType)); + } + + return assembly.GetTypes() + .Where(t => t.GetInterfaces().Contains(interfaceType)); + } + } +} diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index 1cc50c8b..bbde6cde 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -20,42 +20,14 @@ namespace Microsoft.Extensions.DependencyInjection public static IServiceCollection AddOqtaneModules(this IServiceCollection services) { - var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - var assembliesFolder = new DirectoryInfo(assemblyPath); - - // iterate through Oqtane module assemblies in /bin ( filter is narrow to optimize loading process ) - foreach (var file in assembliesFolder.EnumerateFiles("*.Module.*.dll")) - { - // check if assembly is already loaded - var assembly = Assemblies.Where(a => a.Location == file.FullName).FirstOrDefault(); - if (assembly == null) - { - // load assembly from stream to prevent locking file ( as long as dependencies are in /bin they will load as well ) - assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(file.FullName))); - _oqtaneModuleAssemblies.Add(assembly); - } - } + LoadAssemblies("Module"); return services; } public static IServiceCollection AddOqtaneThemes(this IServiceCollection services) { - var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - var assembliesFolder = new DirectoryInfo(assemblyPath); - - // iterate through Oqtane theme assemblies in /bin ( filter is narrow to optimize loading process ) - foreach (var file in assembliesFolder.EnumerateFiles("*.Theme.*.dll")) - { - // check if assembly is already loaded - var assembly = Assemblies.Where(a => a.Location == file.FullName).FirstOrDefault(); - if (assembly == null) - { - // load assembly from stream to prevent locking file ( as long as dependencies are in /bin they will load as well ) - assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(file.FullName))); - _oqtaneModuleAssemblies.Add(assembly); - } - } + LoadAssemblies("Theme"); return services; } @@ -67,20 +39,11 @@ namespace Microsoft.Extensions.DependencyInjection Where(item => item.FullName.StartsWith("Oqtane.") || item.FullName.Contains(".Module.")).ToArray(); foreach (var assembly in assemblies) { - var implementationTypes = assembly.GetTypes() - .Where(t => t.GetInterfaces().Contains(typeof(IService))) - .ToArray(); + var implementationTypes = assembly.GetInterfaces(); foreach (var implementationType in implementationTypes) { - var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, "I" + implementationType.Name)); - if (serviceType != null) - { - services.AddScoped(serviceType, implementationType); // traditional service interface - } - else - { - services.AddScoped(implementationType, implementationType); // no interface defined for service - } + var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}")); + services.AddScoped(serviceType ?? implementationType, implementationType); } } @@ -90,21 +53,39 @@ namespace Microsoft.Extensions.DependencyInjection public static IServiceCollection AddOqtaneHostedServices(this IServiceCollection services) { // dynamically register hosted services + var hostedServiceType = typeof(IHostedService); foreach (var assembly in Assemblies) { - var serviceTypes = assembly.GetTypes() - .Where(t => t.GetInterfaces().Contains(typeof(IHostedService))) - .ToArray(); + var serviceTypes = assembly.GetTypes(hostedServiceType); foreach (var serviceType in serviceTypes) { if (serviceType.Name != nameof(HostedServiceBase)) { - services.AddSingleton(typeof(IHostedService), serviceType); + services.AddSingleton(hostedServiceType, serviceType); } } } return services; } + + private static void LoadAssemblies(string pattern) + { + var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); + var assembliesFolder = new DirectoryInfo(assemblyPath); + + // iterate through Oqtane theme assemblies in /bin ( filter is narrow to optimize loading process ) + foreach (var file in assembliesFolder.EnumerateFiles($"*.{pattern}.*.dll")) + { + // check if assembly is already loaded + var assembly = Assemblies.Where(a => a.Location == file.FullName).FirstOrDefault(); + if (assembly == null) + { + // load assembly from stream to prevent locking file ( as long as dependencies are in /bin they will load as well ) + assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(file.FullName))); + _oqtaneModuleAssemblies.Add(assembly); + } + } + } } }