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

Update structure

Browse Source
This commit is contained in:
Admin
2026-05-28 20:42:38 +02:00
parent ffa3a73bb8
commit 94bf9c61a3
97 changed files with 164 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Infrastructure/Jobs/TemporalUploadsCleanupJob.cs
+8 -8
View File
@@ -1,21 +1,21 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Configuration;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.Jobs
{
public class TemporalUploadsCleanupJob(
public class TemporalUploadsCleanUpJob(
IServiceScopeFactory scopeFactory,
ILogger<TemporalUploadsCleanupJob> logger,
ILogger<TemporalUploadsCleanUpJob> logger,
ApplicationStorageConfiguration storageConfiguration,
UploadIntentConfiguration uploadIntentConfiguration)
: BackgroundService
{
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
logger.LogInformation("TemporalUploadsCleanupJob started (interval: {Interval}s, prefix: {Prefix})",
logger.LogInformation("TemporalUploadsCleanUpJob started (interval: {Interval}s, prefix: {Prefix})",
uploadIntentConfiguration.TempCleanupJobIntervalSeconds,
uploadIntentConfiguration.TempRootPrefix);
@@ -27,7 +27,7 @@ namespace Musify.Infrastructure.Jobs
}
catch (Exception exception) when (exception is not OperationCanceledException)
{
logger.LogError(exception, "Error in TemporalUploadsCleanupJob");
logger.LogError(exception, "Error in TemporalUploadsCleanUpJob");
}
await Task.Delay(TimeSpan.FromSeconds(uploadIntentConfiguration.TempCleanupJobIntervalSeconds), stoppingToken);
@@ -39,7 +39,7 @@ namespace Musify.Infrastructure.Jobs
await using var scope = scopeFactory.CreateAsyncScope();
var storageService = scope.ServiceProvider.GetRequiredService<IStorageService>();
var cutoff = DateTime.UtcNow.AddDays(-uploadIntentConfiguration.TempUploadsRetentionDays);
var cutOff = DateTime.UtcNow.AddDays(-uploadIntentConfiguration.TempUploadsRetentionDays);
var deleted = 0;
var errors = 0;
@@ -48,7 +48,7 @@ namespace Musify.Infrastructure.Jobs
uploadIntentConfiguration.TempRootPrefix,
cancellationToken))
{
if (lastModified >= cutoff)
if (lastModified >= cutOff)
continue;
try
@@ -64,7 +64,7 @@ namespace Musify.Infrastructure.Jobs
}
if (deleted > 0 || errors > 0)
logger.LogInformation("TemporalUploadsCleanupJob: deleted {Deleted} orphaned objects, {Errors} errors", deleted, errors);
logger.LogInformation("TemporalUploadsCleanUpJob: deleted {Deleted} orphaned objects, {Errors} errors", deleted, errors);
}
}
}
Infrastructure/Jobs/UploadIntentExpirationJob.cs
+2 -2
View File
@@ -2,9 +2,9 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Configuration;
using Musify.Domain.Entities;
using Musify.Domain.ValueObjects;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.Jobs
{
Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
+3 -2
View File
@@ -1,9 +1,10 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Domain.Entities;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Domain.ValueObjects;
using Musify.Infrastructure.MassTransit.Arguments;
namespace Musify.Infrastructure.MassTransit.Activities
{
Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
+4 -3
View File
@@ -1,10 +1,11 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Domain.Entities;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Domain.ValueObjects;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
namespace Musify.Infrastructure.MassTransit.Activities
{
Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs
+2 -1
View File
@@ -1,8 +1,9 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Domain.Entities;
using Musify.Domain.ValueObjects;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
Infrastructure/MassTransit/Activities/Files/CopyFileInBucketActivity.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
+3 -3
View File
@@ -1,8 +1,8 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
namespace Musify.Infrastructure.MassTransit.Activities.Files
{
Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs
+2 -2
View File
@@ -1,9 +1,9 @@
using MassTransit;
using Amazon.S3;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Arguments;
using System.Net;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.MassTransit.Activities.Files
{
Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs
+3 -3
View File
@@ -1,8 +1,8 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
namespace Musify.Infrastructure.MassTransit.Activities
{
Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
Infrastructure/MassTransit/Activities/Pictures/GeneratePictureWorkflowPathsActivity.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Arguments;
namespace Musify.Infrastructure.MassTransit.Activities
{
Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
+3 -3
View File
@@ -1,8 +1,8 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
namespace Musify.Infrastructure.MassTransit.Activities
{
Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs
+3 -3
View File
@@ -1,8 +1,8 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
namespace Musify.Infrastructure.MassTransit.Activities
{
Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
+3 -3
View File
@@ -1,8 +1,8 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
namespace Musify.Infrastructure.MassTransit.Activities
{
Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbActivity.cs
+2 -1
View File
@@ -1,7 +1,8 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
namespace Musify.Infrastructure.MassTransit.Activities.PlayLists
{
Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingActivity.cs
+3 -1
View File
@@ -1,8 +1,10 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Domain.Entities;
using Musify.Domain.ValueObjects;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.MassTransit.Activities.PlayLists
{
Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbActivity.cs
+2 -1
View File
@@ -1,7 +1,8 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Infrastructure.MassTransit.Arguments;
namespace Musify.Infrastructure.MassTransit.Activities.Tracks
{
Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingActivity.cs
+3 -1
View File
@@ -1,8 +1,10 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Domain.Entities;
using Musify.Domain.ValueObjects;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.MassTransit.Activities.Tracks
{
Infrastructure/MassTransit/Activities/UploadIntents/ConsumeUploadIntentsActivity.cs
+2 -1
View File
@@ -1,8 +1,9 @@
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Domain.Entities;
using Musify.Domain.ValueObjects;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
Infrastructure/MassTransit/Arguments/DeletePlayListFromDbArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.PlayLists
namespace Musify.Infrastructure.MassTransit.Arguments
{
internal record DeletePlayListFromDbArguments(
Guid PlayListId);
Infrastructure/MassTransit/Arguments/DeleteTrackFromDbArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Tracks
namespace Musify.Infrastructure.MassTransit.Arguments
{
internal record DeleteTrackFromDbArguments(
Guid TrackId);
Infrastructure/MassTransit/Arguments/DownloadFileFromBucketArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record DownloadFileFromBucketArguments(
string Bucket,
Infrastructure/MassTransit/Arguments/GenerateAudioWorkflowPathsArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record GenerateAudioWorkflowPathsArguments(
Guid TrackId,
Infrastructure/MassTransit/Arguments/GeneratePictureWorkflowPathsArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record GeneratePictureWorkflowPathsArguments(
string TemporaryRootDirectory,
Infrastructure/MassTransit/Arguments/MarkPlayListAsRemovingArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.PlayLists
namespace Musify.Infrastructure.MassTransit.Arguments
{
internal record MarkPlayListAsRemovingArguments(
Guid PlayListId);
Infrastructure/MassTransit/Arguments/MarkTrackAsRemovingArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Tracks
namespace Musify.Infrastructure.MassTransit.Arguments
{
internal record MarkTrackAsRemovingArguments(
Guid TrackId);
Infrastructure/MassTransit/Arguments/PublishPlayListPictureProcessingEventArguments.cs
+1
View File
@@ -1,3 +1,4 @@
using Musify.Application.Common;
using Musify.Application.Events;
namespace Musify.Infrastructure.MassTransit.Arguments
Infrastructure/MassTransit/Arguments/PublishTrackProcessingEventsArguments.cs
+1
View File
@@ -1,3 +1,4 @@
using Musify.Application.Common;
using Musify.Application.Events;
namespace Musify.Infrastructure.MassTransit.Arguments
Infrastructure/MassTransit/Arguments/RemoveFileFromBucketArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record RemoveFileFromBucketArguments(
string Bucket,
Infrastructure/MassTransit/Arguments/ResizePictureLocalArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record ResizePictureLocalArguments(
string SourceFilePathVariable,
Infrastructure/MassTransit/Arguments/TranscodeDashAudioArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record TranscodeDashAudioArguments(
Guid TrackId,
Infrastructure/MassTransit/Arguments/TransferFilesToBucketArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record TransferFilesToBucketArguments(
string DestinationBucket,
Infrastructure/MassTransit/Arguments/UpdatePlayListPictureArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record UpdatePlayListPictureArguments(
Guid PlayListId,
Infrastructure/MassTransit/Arguments/UpdateTrackPictureArguments.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Arguments
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record UpdateTrackPictureArguments(
Guid TrackId,
Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.Registration.cs
-2
View File
@@ -2,10 +2,8 @@ using MassTransit;
using Microsoft.Extensions.DependencyInjection;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Audio;
using Musify.Infrastructure.MassTransit.Activities.Files;
using Musify.Infrastructure.MassTransit.Activities.Logs;
using Musify.Infrastructure.MassTransit.Activities.PlayLists;
using Musify.Infrastructure.MassTransit.Activities.Tracks;
using Musify.Infrastructure.MassTransit.Activities.UploadIntents;
Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using MassTransit;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.Persistence;
Infrastructure/MassTransit/Logs/DownloadFileFromBucketLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Logs
namespace Musify.Infrastructure.MassTransit.Logs
{
public record DownloadFileFromBucketLog(
string Bucket,
Infrastructure/MassTransit/Logs/GeneratePictureWorkflowPathsLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Logs
namespace Musify.Infrastructure.MassTransit.Logs
{
public record GeneratePictureWorkflowPathsLog(string WorkingDirectory);
}
Infrastructure/MassTransit/Logs/ResizePictureLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Logs
namespace Musify.Infrastructure.MassTransit.Logs
{
public record ResizePictureLog(string DestinationFilePath);
}
Infrastructure/MassTransit/Logs/TranscodeDashAudioLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Logs
namespace Musify.Infrastructure.MassTransit.Logs
{
public record TranscodeDashAudioLog(string WorkingDirectory);
}
Infrastructure/MassTransit/Logs/TransferFilesToBucketLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Logs
namespace Musify.Infrastructure.MassTransit.Logs
{
public record TransferFilesToBucketLog(string DestinationBucket, string[] UploadedKeys);
}
Infrastructure/MassTransit/Logs/UpdatePlayListPictureLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Logs
namespace Musify.Infrastructure.MassTransit.Logs
{
public record UpdatePlayListPictureLog(
Guid PlayListId,
Infrastructure/MassTransit/Logs/UpdateTrackPictureLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Musify.Infrastructure.MassTransit.Activities.Logs
namespace Musify.Infrastructure.MassTransit.Logs
{
public record UpdateTrackPictureLog(
Guid TrackId,
Infrastructure/MassTransit/MassTransitEventBus.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using MassTransit;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.MassTransit
{
Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
+1 -2
View File
@@ -4,10 +4,9 @@ using Musify.Application.Events;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Activities.Audio;
using Musify.Infrastructure.MassTransit.Activities.Files;
using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
{
Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs
+2 -2
View File
@@ -1,12 +1,12 @@
using MassTransit;
using MassTransit.Courier.Contracts;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Configuration;
using Musify.Infrastructure.MassTransit.Activities.Files;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.PlayLists;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
{
Infrastructure/MassTransit/RoutingSlip/Builders/DeleteTrackRoutingSlipBuilder.cs
+2 -2
View File
@@ -1,12 +1,12 @@
using MassTransit;
using MassTransit.Courier.Contracts;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Configuration;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Files;
using Musify.Infrastructure.MassTransit.Activities.Tracks;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
{
Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
+1 -1
View File
@@ -1,9 +1,9 @@
using MassTransit;
using MassTransit.Courier.Contracts;
using Musify.Application.Common;
using Musify.Application.Events;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Activities;
using Musify.Infrastructure.MassTransit.Activities.Arguments;
using Musify.Infrastructure.MassTransit.Activities.Files;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers;
Infrastructure/MassTransit/RoutingSlip/Builders/PlayListPictureSourceRoutingSlipBuilder.cs
+1
View File
@@ -1,5 +1,6 @@
using MassTransit;
using MassTransit.Courier.Contracts;
using Musify.Application.Common;
using Musify.Application.Events;
using Musify.Infrastructure.MassTransit.Activities.Files;
using Musify.Infrastructure.MassTransit.Activities.PlayLists;
Infrastructure/Persistence/Database.cs
+2 -2
View File
@@ -1,10 +1,10 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
using MassTransit;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
using Musify.Infrastructure.Configuration;
using AppIDatabase = Musify.Application.Contracts.Infrastructure.IDatabase;
using AppIDatabase = Musify.Application.Contracts.IDatabase;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.Persistence
{
Infrastructure/Persistence/DatabaseDependencyInjection.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
namespace Musify.Infrastructure.Persistence
Infrastructure/Services/AudioTranscoderService.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Infrastructure.Configuration;
using System.Diagnostics;
Infrastructure/Services/PictureService.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Processing;
Infrastructure/Services/ServicesDependencyInjection.cs
+2 -2
View File
@@ -2,11 +2,11 @@ using Amazon.S3;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Configuration;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.Jobs;
using Musify.Application.Services;
using Musify.Application.Contracts;
namespace Musify.Infrastructure.Services
{
@@ -66,7 +66,7 @@ namespace Musify.Infrastructure.Services
serviceDescriptors.AddUploadIntentConfiguration(configuration);
serviceDescriptors.AddHostedService<UploadIntentExpirationJob>();
serviceDescriptors.AddHostedService<TemporalUploadsCleanupJob>();
serviceDescriptors.AddHostedService<TemporalUploadsCleanUpJob>();
return serviceDescriptors;
}
Infrastructure/Services/StorageService.cs
+5 -4
View File
@@ -3,10 +3,11 @@ using Amazon.S3.Model;
using Amazon.S3.Transfer;
using Microsoft.Extensions.Logging;
using MimeMapping;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Contracts;
using Musify.Domain.Entities;
using Musify.Domain.ValueObjects;
using Musify.Infrastructure.Configuration;
using ObjectMetadata = Musify.Application.Contracts.Infrastructure.ObjectMetadata;
using ObjectMetaData = Musify.Application.Contracts.ObjectMetaData;
namespace Musify.Infrastructure.Services
{
@@ -70,12 +71,12 @@ namespace Musify.Infrastructure.Services
return await amazonS3.GetPreSignedURLAsync(request);
}
public async Task<ObjectMetadata?> HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken)
public async Task<ObjectMetaData?> HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken)
{
try
{
var response = await amazonS3.GetObjectMetadataAsync(bucket, key, cancellationToken);
return new ObjectMetadata(response.Headers.ContentType, response.ContentLength);
return new ObjectMetaData(response.Headers.ContentType, response.ContentLength);
}
catch (AmazonS3Exception ex) when (ex.StatusCode == System.Net.HttpStatusCode.NotFound)
{