sarsoo/Selector
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fixing config mapping to get migration working

Browse Source
This commit is contained in:
andy 2022-02-26 21:28:51 +00:00
parent 35c24ad0ef
commit a9a41e5b8a
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Selector.CLI/Command/HostCommand.cs
View File

@ -70,6 +70,7 @@ namespace Selector.CLI
Console.WriteLine("> Configuring..."); Console.WriteLine("> Configuring...");
// CONFIG // CONFIG
var config = ConfigureOptions(context, services); var config = ConfigureOptions(context, services);
context.Configuration.ConfigureOptionsInjection(services);
Console.WriteLine("> Adding Services..."); Console.WriteLine("> Adding Services...");
// SERVICES // SERVICES

1
Selector.CLI/Extensions/ServiceExtensions.cs
View File

@ -93,6 +93,7 @@ namespace Selector.CLI.Extensions
); );
services.AddTransient<IScrobbleRepository, ScrobbleRepository>(); services.AddTransient<IScrobbleRepository, ScrobbleRepository>();
services.AddTransient<IScrobbleMappingRepository, ScrobbleMappingRepository>();
services.AddHostedService<MigratorService>(); services.AddHostedService<MigratorService>();
} }

22
Selector.CLI/Options.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace Selector.CLI namespace Selector.CLI
{ {
@ -12,15 +13,31 @@ namespace Selector.CLI
config.GetSection(FormatKeys( new[] { RootOptions.Key, DatabaseOptions.Key})).Bind(options.DatabaseOptions); config.GetSection(FormatKeys( new[] { RootOptions.Key, DatabaseOptions.Key})).Bind(options.DatabaseOptions);
config.GetSection(FormatKeys( new[] { RootOptions.Key, RedisOptions.Key})).Bind(options.RedisOptions); config.GetSection(FormatKeys( new[] { RootOptions.Key, RedisOptions.Key})).Bind(options.RedisOptions);
config.GetSection(FormatKeys( new[] { RootOptions.Key, JobsOptions.Key})).Bind(options.JobOptions); config.GetSection(FormatKeys( new[] { RootOptions.Key, JobsOptions.Key})).Bind(options.JobOptions);
config.GetSection(FormatKeys( new[] { RootOptions.Key, JobsOptions.Key, ScrobbleWatcherJobOptions.Key})).Bind(options.JobOptions.Scrobble); config.GetSection(FormatKeys( new[] { RootOptions.Key, JobsOptions.Key, ScrobbleWatcherJobOptions.Key })).Bind(options.JobOptions.Scrobble);
} }
public static RootOptions ConfigureOptions(this IConfiguration config) public static RootOptions ConfigureOptions(this IConfiguration config)
{ {
var options = config.GetSection(RootOptions.Key).Get<RootOptions>(); var options = config.GetSection(RootOptions.Key).Get<RootOptions>();
ConfigureOptions(options, config); ConfigureOptions(options, config);
return options; return options;
} }
public static RootOptions ConfigureOptionsInjection(this IConfiguration config, IServiceCollection services)
{
var options = config.GetSection(RootOptions.Key).Get<RootOptions>();
services.Configure<DatabaseOptions>(config.GetSection(FormatKeys(new[] { RootOptions.Key, DatabaseOptions.Key })));
services.Configure<RedisOptions>(config.GetSection(FormatKeys(new[] { RootOptions.Key, RedisOptions.Key })));
services.Configure<WatcherOptions>(config.GetSection(FormatKeys(new[] { RootOptions.Key, WatcherOptions.Key })));
services.Configure<JobsOptions>(config.GetSection(FormatKeys(new[] { RootOptions.Key, JobsOptions.Key })));
services.Configure<ScrobbleWatcherJobOptions>(config.GetSection(FormatKeys(new[] { RootOptions.Key, JobsOptions.Key, ScrobbleWatcherJobOptions.Key })));
return options;
}
public static string FormatKeys(string[] args) => string.Join(":", args); public static string FormatKeys(string[] args) => string.Join(":", args);
} }
@ -106,6 +123,7 @@ namespace Selector.CLI
{ {
public const string Key = "Scrobble"; public const string Key = "Scrobble";
public bool Enabled { get; set; } = true;
public TimeSpan InterJobDelay { get; set; } = TimeSpan.FromMinutes(5); public TimeSpan InterJobDelay { get; set; } = TimeSpan.FromMinutes(5);
public TimeSpan InterRequestDelay { get; set; } = TimeSpan.FromMilliseconds(100); public TimeSpan InterRequestDelay { get; set; } = TimeSpan.FromMilliseconds(100);
public DateTime? From { get; set; } = DateTime.UtcNow.AddDays(-14); public DateTime? From { get; set; } = DateTime.UtcNow.AddDays(-14);