taiqane/UmlautAdaptarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix named IOption Bug

Browse Source 
Fix  named IOption Bug
This commit is contained in:
Felix Glang
2024-04-27 21:27:04 +02:00
parent 1a32cc325c
commit 52acb5ff6e
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UmlautAdaptarr/Options/ArrOptions/InstanceOptions/GlobalInstanceOptions.cs
View File

@@ -7,6 +7,11 @@
/// </summary> /// </summary>
public bool Enabled { get; set; } public bool Enabled { get; set; }
/// <summary>
/// Name of the Instance
/// </summary>
public string Name { get; set; }
/// <summary> /// <summary>
/// The host of the ARR application. /// The host of the ARR application.
/// </summary> /// </summary>

29
UmlautAdaptarr/Utilities/ServicesExtensions.cs
View File

@@ -1,4 +1,5 @@
using UmlautAdaptarr.Interfaces; using System.Linq.Expressions;
using UmlautAdaptarr.Interfaces;
using UmlautAdaptarr.Options; using UmlautAdaptarr.Options;
using UmlautAdaptarr.Options.ArrOptions.InstanceOptions; using UmlautAdaptarr.Options.ArrOptions.InstanceOptions;
using UmlautAdaptarr.Providers; using UmlautAdaptarr.Providers;
@@ -45,19 +46,30 @@ public static class ServicesExtensions
throw new InvalidOperationException( throw new InvalidOperationException(
$"{typeof(TService).Name} options could not be loaded from Configuration or ENV Variable."); $"{typeof(TService).Name} options could not be loaded from Configuration or ENV Variable.");
foreach (var options in optionsArray) foreach (var option in optionsArray)
{ {
var instanceState = (bool)(typeof(TOptions).GetProperty("Enabled")?.GetValue(options, null) ?? false); var instanceState = (bool)(typeof(TOptions).GetProperty("Enabled")?.GetValue(option, null) ?? false);
// We only want to create instances that are enabled in the Configs // We only want to create instances that are enabled in the Configs
if (instanceState) if (instanceState)
{ {
// User can give the Instance a readable Name otherwise we use the Host Property // User can give the Instance a readable Name otherwise we use the Host Property
var instanceName = (string)(typeof(TOptions).GetProperty("Name")?.GetValue(options, null) ?? var instanceName = (string)(typeof(TOptions).GetProperty("Name")?.GetValue(option, null) ??
(string)typeof(TOptions).GetProperty("Host")?.GetValue(options, null)!); (string)typeof(TOptions).GetProperty("Host")?.GetValue(option, null)!);
instanceName = instanceName.Replace(".", "");
builder.Services.Configure(instanceName, // Dark Magic , we don't know the Property's of TOptions , and we won't cast them for each Options
delegate(TOptions serviceOptions) { serviceOptions = options; }); var paraexpression = Expression.Parameter(option.GetType(), "x");
foreach (var prop in option.GetType().GetProperties())
{
var val = Expression.Constant(prop.GetValue(option));
var memberexpression = Expression.PropertyOrField(paraexpression, prop.Name);
var assign = Expression.Assign(memberexpression, val);
var exp = Expression.Lambda<Action<TOptions>>(assign, paraexpression);
builder.Services.Configure(instanceName, exp.Compile());
}
builder.Services.AllowResolvingKeyedServicesAsDictionary(); builder.Services.AllowResolvingKeyedServicesAsDictionary();
builder.Services.AddKeyedSingleton<TInterface, TService>(instanceName); builder.Services.AddKeyedSingleton<TInterface, TService>(instanceName);
@@ -100,6 +112,7 @@ public static class ServicesExtensions
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns> /// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
public static WebApplicationBuilder AddSonarrSupport(this WebApplicationBuilder builder) public static WebApplicationBuilder AddSonarrSupport(this WebApplicationBuilder builder)
{ {
// builder.Serviceses.AddSingleton<IOptionsMonitoSonarrInstanceOptionsns>, OptionsMonitoSonarrInstanceOptionsns>>();
return builder.AddServicesWithOptions<SonarrInstanceOptions, SonarrClient, IArrApplication>("Sonarr"); return builder.AddServicesWithOptions<SonarrInstanceOptions, SonarrClient, IArrApplication>("Sonarr");
} }