Skip to content

Commit

Permalink
Decompose ConfigureServices method
Browse files Browse the repository at this point in the history
  • Loading branch information
@Drombeys
Drombeys committed Apr 26, 2024
1 parent 0b75dcc commit 0c3a917
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 66 deletions.
75 changes: 9 additions & 66 deletions src/ImeSense.Launchers.Belarus/App.axaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
using System.Net.Http.Headers;

using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;

using ImeSense.Launchers.Belarus.Manager;
using ImeSense.Launchers.Belarus.Models;
using ImeSense.Launchers.Belarus.Services;
using ImeSense.Launchers.Belarus.ViewModels;
using ImeSense.Launchers.Belarus.ViewModels.Validators;
using ImeSense.Launchers.Belarus.Views;
using ImeSense.Launchers.Belarus.Core.FileHashVerification;
using ImeSense.Launchers.Belarus.Core.Manager;
using ImeSense.Launchers.Belarus.Core.Models;
using ImeSense.Launchers.Belarus.Core.Services;
using ImeSense.Launchers.Belarus.Core.Storage;
using ImeSense.Launchers.Belarus.Core.Validators;

using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;

using Serilog;
using ImeSense.Launchers.Belarus.Injection;
using ImeSense.Launchers.Belarus.Core.Services;

namespace ImeSense.Launchers.Belarus;

Expand All @@ -34,79 +28,27 @@ public App()
.BuildServiceProvider();
}

private IServiceCollection ConfigureServices()
private static ServiceCollection ConfigureServices()
{
var services = new ServiceCollection();

services.AddLogging(loggingBuilder =>
loggingBuilder.AddSerilog(dispose: true));

services.AddSingleton<IWindowManager, WindowManager>();
services.AddSingleton<AuthorizationView>();
services.AddSingleton<DownloadMenuView>();
services.AddSingleton<GameMenuView>();
services.AddSingleton<LauncherView>();
services.AddSingleton<LinkView>();
services.AddSingleton<NewsSliderView>();
services.AddTransient<NewsView>();
services.AddTransient<SplashScreenView>();
services.AddSingleton<StartGameView>();

services.AddTransient<GameDirectoryValidator>();

services.AddHttpClient<IGitStorageApiService, GitHubApiService>()
.ConfigurePrimaryHttpMessageHandler(() =>
{
return new HttpClientHandler {
SslProtocols = System.Security.Authentication.SslProtocols.Tls12
}; ;
})
.ConfigureHttpClient(ConfigureClient);
services.AddHttpClient<IFileDownloadManager, FileDownloadManager>()
.ConfigurePrimaryHttpMessageHandler(() => {
return new HttpClientHandler {
SslProtocols = System.Security.Authentication.SslProtocols.Tls12
}; ;
})
.ConfigureHttpClient(ConfigureClient);
services.AddPresetationServices();
services.AddValidators();
services.AddManagers();
services.AddServices();

services.AddTransient<IHashProvider, Md5HashProvider>();
services.AddTransient<HashChecker>();
services.AddTransient<IDownloadResourcesService, DownloadResourcesService>();
services.AddTransient<IWebsiteLauncher, WebsiteLauncher>();
services.AddTransient<IAuthenticationValidator, AuthenticationValidator>();
services.AddTransient<IStartGameValidator, StartGameValidator>();
services.AddTransient<HashChecker>();
services.AddSingleton<ILauncherStorage, MemoryLauncherStorage>();
services.AddSingleton<IApplicationLocaleManager, AxamlLocaleManager>();
services.AddTransient<IReleaseComparerService<GitHubRelease>, ReleaseComparerService>();
services.AddTransient<IUpdaterService, UpdaterService>();
services.AddSingleton<AuthenticationViewModelValidator>();
services.AddSingleton<StartGameViewModelValidator>();
services.AddSingleton<UserManager>();
services.AddSingleton<InitializerManager>();
services.AddTransient<SplashScreenViewModel>();
services.AddTransient<LinkViewModel>();
services.AddTransient<NewsSliderViewModel>();
services.AddSingleton<LauncherViewModel>();
services.AddTransient<DownloadMenuViewModel>();
services.AddTransient<GameMenuViewModel>();

services.AddTransient<AuthorizationViewModel>();
services.AddSingleton<StartGameViewModel>();
services.AddSingleton<MainWindowViewModel>();

services.AddSingleton<ViewModelLocator>();

return services;
}

private static void ConfigureClient(HttpClient httpClient)
{
httpClient.BaseAddress = UriStorage.BelarusApiUri;
httpClient.DefaultRequestHeaders.Accept.Clear();
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github.v3+json"));
httpClient.DefaultRequestHeaders.Add("User-Agent", ".NET Foundation Repository Reporter");
}

public override void Initialize()
{
Expand All @@ -116,6 +58,7 @@ public override void Initialize()
AvaloniaXamlLoader.Load(this);
} catch (Exception exception) {
logger.LogCritical("{Message}", exception.Message);
logger.LogInformation("{StackTrace}", exception.StackTrace);
throw;
}
}
Expand Down
108 changes: 108 additions & 0 deletions src/ImeSense.Launchers.Belarus/Injection/ServiceCollectionExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
using System.Net.Http.Headers;

using ImeSense.Launchers.Belarus.Core.Manager;
using ImeSense.Launchers.Belarus.Core.Models;
using ImeSense.Launchers.Belarus.Core.Services;
using ImeSense.Launchers.Belarus.Core.Storage;
using ImeSense.Launchers.Belarus.Core.Validators;
using ImeSense.Launchers.Belarus.Manager;
using ImeSense.Launchers.Belarus.ViewModels;
using ImeSense.Launchers.Belarus.ViewModels.Validators;
using ImeSense.Launchers.Belarus.Views;

using Microsoft.Extensions.DependencyInjection;

namespace ImeSense.Launchers.Belarus.Injection;

internal static class ServiceCollectionExtensions
{
public static IServiceCollection AddManagers(this IServiceCollection services)
{
services.AddSingleton<IWindowManager, WindowManager>();
services.AddHttpClient<IFileDownloadManager, FileDownloadManager>()
.ConfigurePrimaryHttpMessageHandler(() => {
return new HttpClientHandler {
SslProtocols = System.Security.Authentication.SslProtocols.Tls12
}; ;
}).ConfigureHttpClient(ConfigureClient);
services.AddSingleton<UserManager>();
services.AddSingleton<InitializerManager>();
services.AddSingleton<IApplicationLocaleManager, AxamlLocaleManager>();

return services;
}

public static IServiceCollection AddServices(this IServiceCollection services)
{
services.AddHttpClient<IGitStorageApiService, GitHubApiService>()
.ConfigurePrimaryHttpMessageHandler(() =>
{
return new HttpClientHandler {
SslProtocols = System.Security.Authentication.SslProtocols.Tls12
}; ;
})
.ConfigureHttpClient(ConfigureClient);
services.AddTransient<IReleaseComparerService<GitHubRelease>, ReleaseComparerService>();
services.AddTransient<IUpdaterService, UpdaterService>();
services.AddTransient<IDownloadResourcesService, DownloadResourcesService>();

return services;
}

public static IServiceCollection AddPresetationServices(this IServiceCollection services)
{
services.AddViewModels();
services.AddViews();

return services;
}

public static IServiceCollection AddViewModels(this IServiceCollection services)
{
services.AddTransient<SplashScreenViewModel>();
services.AddTransient<LinkViewModel>();
services.AddTransient<NewsSliderViewModel>();
services.AddSingleton<LauncherViewModel>();
services.AddTransient<DownloadMenuViewModel>();
services.AddTransient<GameMenuViewModel>();
services.AddTransient<AuthorizationViewModel>();
services.AddSingleton<StartGameViewModel>();
services.AddSingleton<MainWindowViewModel>();

return services;
}

public static IServiceCollection AddViews(this IServiceCollection services)
{
services.AddTransient<AuthorizationView>();
services.AddSingleton<DownloadMenuView>();
services.AddSingleton<GameMenuView>();
services.AddSingleton<LauncherView>();
services.AddSingleton<LinkView>();
services.AddSingleton<NewsSliderView>();
services.AddTransient<NewsView>();
services.AddTransient<SplashScreenView>();
services.AddSingleton<StartGameView>();

return services;
}

public static IServiceCollection AddValidators(this IServiceCollection services)
{
services.AddTransient<GameDirectoryValidator>();
services.AddTransient<AuthenticationViewModelValidator>();
services.AddTransient<StartGameViewModelValidator>();
services.AddTransient<IAuthenticationValidator, AuthenticationValidator>();
services.AddTransient<IStartGameValidator, StartGameValidator>();
return services;
}

private static void ConfigureClient(HttpClient httpClient)
{
httpClient.BaseAddress = UriStorage.BelarusApiUri;
httpClient.DefaultRequestHeaders.Accept.Clear();
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github.v3+json"));
httpClient.DefaultRequestHeaders.Add("User-Agent", ".NET Foundation Repository Reporter");
}

}

0 comments on commit 0c3a917

Please sign in to comment.