NotS1mp/Musify
0
0
Fork 0
Code Issues 23 Pull Requests Actions Packages Projects Releases Wiki Activity

Unify picture configuration and options registration

Browse Source
This commit is contained in:
Admin
2026-09-24 05:23:40 +02:00
parent 5e819d7676
commit 4d943e068e
51 changed files with 384 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/Core/Musify.Infrastructure/Configuration/AudioConfiguration.cs
+3 -2
View File
@@ -1,10 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Configuration;
public class AudioConfiguration
public class AudioConfiguration : IConfigurationOptions
{
public const string SectionName = "AudioTranscoder";
public static string SectionName => "AudioTranscoder";
[Required]
public TimeSpan TranscodingTimeout { get; set; } = TimeSpan.FromMinutes(5);
backend/Core/Musify.Infrastructure/Configuration/DatabaseConfiguration.cs
+3 -2
View File
@@ -1,10 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Configuration;
public class DatabaseConfiguration
public class DatabaseConfiguration : IConfigurationOptions
{
public const string SectionName = "Database";
public static string SectionName => "Database";
[Required]
public required string ConnectionString { get; set; }
backend/Core/Musify.Infrastructure/Configuration/InfrastructureStorageConfiguration.cs
+3 -2
View File
@@ -1,10 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Configuration;
public class InfrastructureStorageConfiguration
public class InfrastructureStorageConfiguration : IConfigurationOptions
{
public const string SectionName = "InfrastructureStorage";
public static string SectionName => "InfrastructureStorage";
[Url]
[Required]
backend/Core/Musify.Infrastructure/Configuration/MassTransitConfiguration.cs
+3 -2
View File
@@ -1,10 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Configuration;
public class MassTransitConfiguration
public class MassTransitConfiguration : IConfigurationOptions
{
public const string SectionName = "MassTransit";
public static string SectionName => "MassTransit";
[Required]
public required string Address { get; set; }
backend/Core/Musify.Infrastructure/Configuration/OpenTelemetryConfiguration.cs
+3 -2
View File
@@ -1,10 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Configuration;
public class OpenTelemetryConfiguration
public class OpenTelemetryConfiguration : IConfigurationOptions
{
public const string SectionName = "OpenTelemetry";
public static string SectionName => "OpenTelemetry";
[Url]
[Required]
backend/Core/Musify.Infrastructure/Configuration/StreamTicketConfiguration.cs
+3 -2
View File
@@ -1,10 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Configuration;
public class StreamTicketConfiguration
public class StreamTicketConfiguration : IConfigurationOptions
{
public const string SectionName = "StreamTicket";
public static string SectionName => "StreamTicket";
[Required]
public required string PrivateKeyPath { get; set; }
backend/Core/Musify.Infrastructure/Configuration/WorkerConfiguration.cs
+3 -2
View File
@@ -1,10 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Configuration;
public class WorkerConfiguration
public class WorkerConfiguration : IConfigurationOptions
{
public const string SectionName = "Workers";
public static string SectionName => "Workers";
[Required]
public WorkerRoutes Routes { get; set; } = new WorkerRoutes();
backend/Core/Musify.Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.Options.cs
-23
View File
@@ -1,23 +0,0 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
namespace Musify.Infrastructure.MassTransit;
public static partial class MassTransitDependencyInjection
{
private static void RegisterValidatedOptions<TOptions>(
IServiceCollection services,
IConfiguration configuration,
string sectionName)
where TOptions : class
{
services
.AddOptionsWithValidateOnStart<TOptions>()
.Bind(configuration.GetRequiredSection(sectionName))
.ValidateDataAnnotations();
services.AddSingleton(serviceProvider =>
serviceProvider.GetRequiredService<IOptions<TOptions>>().Value);
}
}
backend/Core/Musify.Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
+12 -20
View File
@@ -5,20 +5,18 @@ using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Sagas;
using Musify.Infrastructure.Persistence;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.MassTransit;
public static partial class MassTransitDependencyInjection
{
public static IServiceCollection AddMassTransitClient(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddMassTransitClient(this IServiceCollection services, IConfiguration configuration)
{
RegisterValidatedOptions<MassTransitConfiguration>(
serviceDescriptors,
configuration,
MassTransitConfiguration.SectionName);
services.AddValidatedOptions<MassTransitConfiguration>(configuration);
serviceDescriptors.AddScoped<IEventBus, MassTransitEventBus>();
serviceDescriptors.AddMassTransit(options =>
services.AddScoped<IEventBus, MassTransitEventBus>();
services.AddMassTransit(options =>
{
options.AddEntityFrameworkOutbox<Database>(outbox =>
{
@@ -35,24 +33,18 @@ public static partial class MassTransitDependencyInjection
busRegistrationContext.GetRequiredService<MassTransitConfiguration>()));
});
return serviceDescriptors;
return services;
}
public static IServiceCollection AddMassTransitConsumers(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddMassTransitConsumers(this IServiceCollection services, IConfiguration configuration)
{
RegisterValidatedOptions<MassTransitConfiguration>(
serviceDescriptors,
configuration,
MassTransitConfiguration.SectionName);
services.AddValidatedOptions<MassTransitConfiguration>(configuration);
RegisterValidatedOptions<WorkerConfiguration>(
serviceDescriptors,
configuration,
WorkerConfiguration.SectionName);
services.AddValidatedOptions<WorkerConfiguration>(configuration);
RegisterRoutingSlipBuilders(serviceDescriptors);
RegisterRoutingSlipBuilders(services);
serviceDescriptors.AddMassTransit(options =>
services.AddMassTransit(options =>
{
options.AddEntityFrameworkOutbox<Database>(outbox =>
{
@@ -107,7 +99,7 @@ public static partial class MassTransitDependencyInjection
});
});
return serviceDescriptors;
return services;
}
private static void UseStandardRetry(IReceiveEndpointConfigurator endpointConfigurator) =>
backend/Core/Musify.Infrastructure/MassTransit/RoutingSlip/Builders/DeleteAlbumRoutingSlipBuilder.cs
+3 -3
View File
@@ -59,7 +59,7 @@ public class DeleteAlbumRoutingSlipBuilder(
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
routes.BuildSmallPicturePath(smallName)));
routes.BuildPicturePath(PictureSize.Small, smallName)));
}
if (album.Pictures.MediumName is { } mediumName)
@@ -69,7 +69,7 @@ public class DeleteAlbumRoutingSlipBuilder(
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
routes.BuildMediumPicturePath(mediumName)));
routes.BuildPicturePath(PictureSize.Medium, mediumName)));
}
if (album.Pictures.LargeName is { } largeName)
@@ -79,7 +79,7 @@ public class DeleteAlbumRoutingSlipBuilder(
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
routes.BuildLargePicturePath(largeName)));
routes.BuildPicturePath(PictureSize.Large, largeName)));
}
}
backend/Core/Musify.Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs
+3 -3
View File
@@ -59,7 +59,7 @@ public class DeletePlayListRoutingSlipBuilder(
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
routes.BuildSmallPicturePath(smallName)));
routes.BuildPicturePath(PictureSize.Small, smallName)));
}
if (playList.Pictures.MediumName is { } mediumName)
@@ -69,7 +69,7 @@ public class DeletePlayListRoutingSlipBuilder(
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
routes.BuildMediumPicturePath(mediumName)));
routes.BuildPicturePath(PictureSize.Medium, mediumName)));
}
if (playList.Pictures.LargeName is { } largeName)
@@ -79,7 +79,7 @@ public class DeletePlayListRoutingSlipBuilder(
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
routes.BuildLargePicturePath(largeName)));
routes.BuildPicturePath(PictureSize.Large, largeName)));
}
}
backend/Core/Musify.Infrastructure/MassTransit/RoutingSlip/Builders/DeleteTrackRoutingSlipBuilder.cs
+3 -3
View File
@@ -58,21 +58,21 @@ public class DeleteTrackRoutingSlipBuilder(
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
trackConfiguration.Routes.BuildSmallPicturePath(track.Pictures.SmallName)));
trackConfiguration.Routes.BuildPicturePath(PictureSize.Small, track.Pictures.SmallName)));
routingSlipBuilder.AddActivity(
ActivityNames.RemoveTrackMediumPicture,
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
trackConfiguration.Routes.BuildMediumPicturePath(track.Pictures.MediumName)));
trackConfiguration.Routes.BuildPicturePath(PictureSize.Medium, track.Pictures.MediumName)));
routingSlipBuilder.AddActivity(
ActivityNames.RemoveTrackLargePicture,
EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(
bucket,
trackConfiguration.Routes.BuildLargePicturePath(track.Pictures.LargeName)));
trackConfiguration.Routes.BuildPicturePath(PictureSize.Large, track.Pictures.LargeName)));
}
if (!string.IsNullOrEmpty(track.Audio.OriginalName))
backend/Core/Musify.Infrastructure/Observability/OpenTelemetryDependencyInjection.cs
+6 -12
View File
@@ -1,35 +1,29 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Musify.Infrastructure.Configuration;
using OpenTelemetry.Exporter;
using OpenTelemetry.Logs;
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Observability;
public static class OpenTelemetryDependencyInjection
{
public static IServiceCollection AddObservability(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddObservability(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors
.AddOptionsWithValidateOnStart<OpenTelemetryConfiguration>()
.Bind(configuration.GetRequiredSection(OpenTelemetryConfiguration.SectionName))
.ValidateDataAnnotations();
services.AddValidatedOptions<OpenTelemetryConfiguration>(configuration);
serviceDescriptors.AddSingleton(serviceProvider =>
serviceProvider.GetRequiredService<IOptions<OpenTelemetryConfiguration>>().Value);
serviceDescriptors
services
.AddOptions<OtlpExporterOptions>()
.Configure<OpenTelemetryConfiguration>((exporterOptions, openTelemetryConfiguration) =>
{
exporterOptions.Endpoint = new Uri(openTelemetryConfiguration.OtlpEndpoint);
});
serviceDescriptors
services
.AddOpenTelemetry()
.ConfigureResource(resource =>
{
@@ -54,6 +48,6 @@ public static class OpenTelemetryDependencyInjection
logging.AddOtlpExporter()
);
return serviceDescriptors;
return services;
}
}
backend/Core/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs
+6 -12
View File
@@ -1,27 +1,21 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
using Musify.Application.Configuration;
namespace Musify.Infrastructure.Persistence;
public static class DatabaseDependencyInjection
{
public static IServiceCollection AddDatabase(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors
.AddOptionsWithValidateOnStart<DatabaseConfiguration>()
.Bind(configuration.GetRequiredSection(DatabaseConfiguration.SectionName))
.ValidateDataAnnotations();
services.AddValidatedOptions<DatabaseConfiguration>(configuration);
serviceDescriptors.AddSingleton(serviceProvider =>
serviceProvider.GetRequiredService<IOptions<DatabaseConfiguration>>().Value);
services.AddDbContext<Database>();
serviceDescriptors.AddDbContext<Database>();
services.AddScoped<IDatabase>(serviceProvider => serviceProvider.GetRequiredService<Database>());
serviceDescriptors.AddScoped<IDatabase>(serviceProvider => serviceProvider.GetRequiredService<Database>());
return serviceDescriptors;
return services;
}
}
backend/Core/Musify.Infrastructure/Services/ServicesDependencyInjection.cs
+30 -49
View File
@@ -3,7 +3,6 @@ using Hangfire;
using Hangfire.PostgreSql;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Musify.Application.Configuration;
using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
@@ -13,17 +12,11 @@ namespace Musify.Infrastructure.Services;
public static class ServicesDependencyInjection
{
public static IServiceCollection AddStorageService(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddStorageService(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors
.AddOptionsWithValidateOnStart<InfrastructureStorageConfiguration>()
.Bind(configuration.GetRequiredSection(InfrastructureStorageConfiguration.SectionName))
.ValidateDataAnnotations();
services.AddValidatedOptions<InfrastructureStorageConfiguration>(configuration);
serviceDescriptors.AddSingleton(serviceProvider =>
serviceProvider.GetRequiredService<IOptions<InfrastructureStorageConfiguration>>().Value);
serviceDescriptors.AddSingleton<IAmazonS3>(serviceProvider =>
services.AddSingleton<IAmazonS3>(serviceProvider =>
{
var configuration = serviceProvider.GetRequiredService<InfrastructureStorageConfiguration>();
var s3Configuration = new AmazonS3Config
@@ -35,74 +28,62 @@ public static class ServicesDependencyInjection
return new AmazonS3Client(configuration.AccessKey, configuration.SecretAccessKey, s3Configuration);
});
serviceDescriptors.AddScoped<IStorageService, StorageService>();
return serviceDescriptors;
services.AddScoped<IStorageService, StorageService>();
return services;
}
public static IServiceCollection AddPictureService(this IServiceCollection serviceDescriptors)
public static IServiceCollection AddPictureService(this IServiceCollection services)
{
serviceDescriptors.AddScoped<IPictureService, PictureService>();
return serviceDescriptors;
services.AddScoped<IPictureService, PictureService>();
return services;
}
public static IServiceCollection AddUploadIntentConfiguration(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddUploadIntentConfiguration(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors.AddValidatedOptions<UploadIntentConfiguration>(configuration, UploadIntentConfiguration.SectionName);
services.AddValidatedOptions<UploadIntentConfiguration>(configuration);
return serviceDescriptors;
return services;
}
public static IServiceCollection AddUploadIntentJobs(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddUploadIntentJobs(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors.AddUploadIntentConfiguration(configuration);
services.AddUploadIntentConfiguration(configuration);
serviceDescriptors.AddHostedService<UploadIntentExpirationJob>();
serviceDescriptors.AddHostedService<TemporalUploadsCleanUpJob>();
services.AddHostedService<UploadIntentExpirationJob>();
services.AddHostedService<TemporalUploadsCleanUpJob>();
return serviceDescriptors;
return services;
}
public static IServiceCollection AddDailyMixGenerationJob(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddDailyMixGenerationJob(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors.AddHangfire((serviceProvider, hangfireConfiguration) =>
services.AddHangfire((serviceProvider, hangfireConfiguration) =>
{
var databaseConfiguration = serviceProvider.GetRequiredService<DatabaseConfiguration>();
hangfireConfiguration.UsePostgreSqlStorage(options =>
options.UseNpgsqlConnection(databaseConfiguration.ConnectionString));
});
serviceDescriptors.AddHangfireServer();
serviceDescriptors.AddScoped<DailyMixGenerationJob>();
serviceDescriptors.AddScoped<ListeningHistoryCleanupJob>();
services.AddHangfireServer();
services.AddScoped<DailyMixGenerationJob>();
services.AddScoped<ListeningHistoryCleanupJob>();
return serviceDescriptors;
return services;
}
public static IServiceCollection AddStreamTicketService(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddStreamTicketService(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors
.AddOptionsWithValidateOnStart<StreamTicketConfiguration>()
.Bind(configuration.GetRequiredSection(StreamTicketConfiguration.SectionName))
.ValidateDataAnnotations();
services.AddValidatedOptions<StreamTicketConfiguration>(configuration);
serviceDescriptors.AddSingleton(serviceProvider =>
serviceProvider.GetRequiredService<IOptions<StreamTicketConfiguration>>().Value);
serviceDescriptors.AddSingleton<IStreamTicketService, StreamTicketService>();
return serviceDescriptors;
services.AddSingleton<IStreamTicketService, StreamTicketService>();
return services;
}
public static IServiceCollection AddAudioTranscoder(this IServiceCollection serviceDescriptors, IConfiguration configuration)
public static IServiceCollection AddAudioTranscoder(this IServiceCollection services, IConfiguration configuration)
{
serviceDescriptors
.AddOptionsWithValidateOnStart<AudioConfiguration>()
.Bind(configuration.GetRequiredSection(AudioConfiguration.SectionName))
.ValidateDataAnnotations();
services.AddValidatedOptions<AudioConfiguration>(configuration);
serviceDescriptors.AddSingleton(serviceProvider =>
serviceProvider.GetRequiredService<IOptions<AudioConfiguration>>().Value);
serviceDescriptors.AddScoped<IAudioTranscoderService, AudioService>();
return serviceDescriptors;
services.AddScoped<IAudioTranscoderService, AudioService>();
return services;
}
}