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

Fixes

Browse Source
This commit is contained in:
Admin
2026-03-25 02:13:47 +01:00
parent 6e06d7673d
commit 3dea06b0cc
23 changed files with 260 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Infrastructure/Infrastructure.csproj
-2
View File
@@ -38,9 +38,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="MassTransit\Activities\Audio\" />
<Folder Include="MassTransit\Activities\Pictures\" />
<Folder Include="MassTransit\Logs\" />
<Folder Include="MassTransit\RoutingSlip\Variables\" />
<Folder Include="MassTransit\Filters\" />
<Folder Include="MassTransit\EventBus\" />
Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
+14 -12
View File
@@ -39,21 +39,23 @@ namespace Musify.Infrastructure.Messaging.Activities
try
{
await using var fileStream = File.OpenRead(sourceFilePath);
var result = await audioTranscoder.TranscodeToDashAsync(
fileStream,
workingDirectory,
executeContext.CancellationToken);
if (!result.IsSuccess)
await using (var fileStream = File.OpenRead(sourceFilePath))
{
var errorMessage = string.Join("; ", result.Errors);
logger.LogError("Transcoding failed for file {SourceFilePath}. Errors: {ErrorMessage}",
sourceFilePath, errorMessage);
throw new Exception(errorMessage);
var result = await audioTranscoder.TranscodeToDashAsync(
fileStream,
workingDirectory,
executeContext.CancellationToken);
if (!result.IsSuccess)
{
var errorMessage = string.Join("; ", result.Errors);
logger.LogError("Transcoding failed for file {SourceFilePath}. Errors: {ErrorMessage}",
sourceFilePath, errorMessage);
throw new Exception(errorMessage);
}
}
File.Delete(sourceFilePath);
await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
return executeContext.Completed();
}
Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs
+99
View File
@@ -0,0 +1,99 @@
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Logs;
using Musify.Infrastructure.Messaging.Activities;
namespace Musify.Infrastructure.MassTransit.Activities.Audio
{
public class UpdateTrackAudioActivity(
IDatabase database,
ILogger<TranscodeDashAudioActivity> logger,
IProcessTrackingStore processTrackingStore)
: IActivity<UpdateTrackAudioArguments, UpdateTrackAudioLog>
{
public const string ExecuteEndpointName = "update-track-audio";
public async Task<ExecutionResult> Execute(ExecuteContext<UpdateTrackAudioArguments> executeContext)
{
var processId = await processTrackingStore.GetOrCreateProcessAsync(
"RoutingSlip",
executeContext.CorrelationId ?? executeContext.TrackingNumber,
executeContext.ConversationId,
executeContext.MessageId,
executeContext.CancellationToken);
var stepId = await processTrackingStore.StartStepAsync(
processId,
nameof(UpdateTrackAudioActivity),
ProcessStepComponentType.Activity,
0,
executeContext.CancellationToken);
try
{
var track = await database.Tracks.FindAsync(
[executeContext.Arguments.TrackId],
cancellationToken: executeContext.CancellationToken);
if (track is null)
{
logger.LogWarning("Track with id {TrackId} not found",
executeContext.Arguments.TrackId);
throw new InvalidOperationException($"Track with id {executeContext.Arguments.TrackId} not found");
}
var log = new UpdateTrackAudioLog(
track.Id,
track.AudioFolderKeyName);
track.AudioFolderKeyName = Path.GetFileName(executeContext.Arguments.AudioFolderKeyName);
database.Tracks.Update(track);
await database.SaveChangesAsync(executeContext.CancellationToken);
logger.LogInformation("Updated Track {TrackId} audio",
executeContext.Arguments.TrackId);
await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
return executeContext.Completed();
}
catch (Exception exception)
{
logger.LogError(exception, "Error updating Track {TrackId} audio",
executeContext.Arguments.TrackId);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
}
}
public async Task<CompensationResult> Compensate(CompensateContext<UpdateTrackAudioLog> compensateContext)
{
try
{
var track = await database.Tracks.FindAsync(
[compensateContext.Log.TrackId],
cancellationToken: compensateContext.CancellationToken);
if (track is null)
{
return compensateContext.Compensated();
}
track.AudioFolderKeyName = compensateContext.Log.PreviousFolderAudioKeyName;
database.Tracks.Update(track);
await database.SaveChangesAsync(compensateContext.CancellationToken);
return compensateContext.Compensated();
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating Track {TrackId} audio", compensateContext.Log.TrackId);
return compensateContext.Failed(exception);
}
}
}
}
Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs
+1 -1
View File
@@ -46,7 +46,7 @@ namespace Musify.Infrastructure.Messaging.Activities
try
{
var uploadedKeys = Directory.GetFiles(folderPath)
.Select(file => $"{destinationKeyName}/{Path.GetFileName(file) }")
.Select(file => Path.Combine(destinationKeyName, Path.GetFileName(file)))
.ToArray();
var transferFilesResult = await storageHandler.TransferFilesAsync(
Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs
+4 -4
View File
@@ -51,10 +51,10 @@ namespace Musify.Infrastructure.Messaging.Activities
playList.MediumPictureKeyName,
playList.LargePictureKeyName);
playList.OriginalPictureKeyName = executeContext.Arguments.OriginalPictureKeyName;
playList.SmallPictureKeyName = executeContext.Arguments.SmallPictureKeyName;
playList.MediumPictureKeyName = executeContext.Arguments.MediumPictureKeyName;
playList.LargePictureKeyName = executeContext.Arguments.LargePictureKeyName;
playList.OriginalPictureKeyName = Path.GetFileName(executeContext.Arguments.OriginalPictureKeyName);
playList.SmallPictureKeyName = Path.GetFileName(executeContext.Arguments.SmallPictureKeyName);
playList.MediumPictureKeyName = Path.GetFileName(executeContext.Arguments.MediumPictureKeyName);
playList.LargePictureKeyName = Path.GetFileName(executeContext.Arguments.LargePictureKeyName);
database.PlayLists.Update(playList);
await database.SaveChangesAsync(executeContext.CancellationToken);
Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
+4 -4
View File
@@ -51,10 +51,10 @@ namespace Musify.Infrastructure.Messaging.Activities
track.MediumPictureKeyName,
track.LargePictureKeyName);
track.OriginalPictureKeyName = executeContext.Arguments.OriginalPictureKeyName;
track.SmallPictureKeyName = executeContext.Arguments.SmallPictureKeyName;
track.MediumPictureKeyName = executeContext.Arguments.MediumPictureKeyName;
track.LargePictureKeyName = executeContext.Arguments.LargePictureKeyName;
track.OriginalPictureKeyName = Path.GetFileName(executeContext.Arguments.OriginalPictureKeyName);
track.SmallPictureKeyName = Path.GetFileName(executeContext.Arguments.SmallPictureKeyName);
track.MediumPictureKeyName = Path.GetFileName(executeContext.Arguments.MediumPictureKeyName);
track.LargePictureKeyName = Path.GetFileName(executeContext.Arguments.LargePictureKeyName);
database.Tracks.Update(track);
await database.SaveChangesAsync(executeContext.CancellationToken);
Infrastructure/MassTransit/Arguments/UpdateTrackAudioArguments.cs
+6
View File
@@ -0,0 +1,6 @@
namespace Musify.Infrastructure.MassTransit.Arguments
{
public record UpdateTrackAudioArguments(
Guid TrackId,
string AudioFolderKeyName);
}
Infrastructure/MassTransit/Consumers/TranscodeAudioFromTrackConsumer.cs → Infrastructure/MassTransit/Consumers/UpdateTrackAudioConsumer.cs
+5 -5
View File
@@ -2,16 +2,16 @@
using Musify.Application.Events;
using Musify.Infrastructure.Messaging.RoutingSlip.Builders;
namespace Musify.Infrastructure.Messaging.Consumers
namespace Musify.Infrastructure.MassTransit.Consumers
{
public class TranscodeAudioFromTrackConsumer(
public class UpdateTrackAudioConsumer(
IBus bus,
AudioWorkflowRoutingSlipBuilder routingSlipBuilder)
: IConsumer<TranscodeAudioFromTrackEvent>
: IConsumer<UpdateTrackAudioEvent>
{
public const string QueueName = "transcode-audio-from-track";
public const string QueueName = "update-track-audio";
public async Task Consume(ConsumeContext<TranscodeAudioFromTrackEvent> consumeContext)
public async Task Consume(ConsumeContext<UpdateTrackAudioEvent> consumeContext)
{
var routingSlip = routingSlipBuilder
.Build(consumeContext.Message, consumeContext.CorrelationId)
Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs
+7 -3
View File
@@ -1,7 +1,10 @@
using MassTransit;
using Microsoft.Extensions.DependencyInjection;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Activities.Audio;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.MassTransit.Logs;
using Musify.Infrastructure.Messaging.Activities;
using Musify.Infrastructure.Messaging.Activities.Arguments;
using Musify.Infrastructure.Messaging.Activities.Logs;
@@ -36,9 +39,9 @@ namespace Musify.Infrastructure.Messaging
{
options.AddConsumer<UpdatePlayListPictureConsumer>();
options.AddConsumer<RemoveFileConsumer>();
options.AddConsumer<TranscodeAudioFromTrackConsumer>();
options.AddConsumer<UpdateTrackPictureConsumer>();
options.AddConsumer<RoutingSlipCleanUpConsumer>();
options.AddConsumer<UpdateTrackAudioConsumer>();
options.AddExecuteActivity<RemoveFileFromBucketActivity, RemoveFileFromBucketArguments>();
options.AddExecuteActivity<GenerateAudioWorkflowPathsActivity, GenerateAudioWorkflowPathsArguments>();
@@ -50,6 +53,7 @@ namespace Musify.Infrastructure.Messaging
options.AddActivity<DownloadFileFromBucketActivity, DownloadFileFromBucketArguments, DownloadFileFromBucketLog>();
options.AddActivity<TranscodeDashAudioActivity, TranscodeDashAudioArguments, TranscodeDashAudioLog>();
options.AddActivity<TransferFilesToBucketActivity, TransferFilesToBucketArguments, TransferFilesToBucketLog>();
options.AddActivity<UpdateTrackAudioActivity, UpdateTrackAudioArguments, UpdateTrackAudioLog>();
options.UsingRabbitMq((busRegistrationContext, busFactoryConfigurator) =>
{
@@ -69,9 +73,9 @@ namespace Musify.Infrastructure.Messaging
endpointConfigurator.ConfigureConsumer<RemoveFileConsumer>(busRegistrationContext);
} );
busFactoryConfigurator.ReceiveEndpoint(TranscodeAudioFromTrackConsumer.QueueName, endpointConfigurator =>
busFactoryConfigurator.ReceiveEndpoint(UpdateTrackAudioConsumer.QueueName, endpointConfigurator =>
{
endpointConfigurator.ConfigureConsumer<TranscodeAudioFromTrackConsumer>(busRegistrationContext);
endpointConfigurator.ConfigureConsumer<UpdateTrackAudioConsumer>(busRegistrationContext);
} );
busFactoryConfigurator.ReceiveEndpoint(UpdateTrackPictureConsumer.QueueName, endpointConfigurator =>
Infrastructure/MassTransit/RoutingSlip/ActivityNames.cs
+1
View File
@@ -14,5 +14,6 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip
internal const string DeleteOriginal = "DeleteOriginal";
internal const string UpdateTrackPicture = "UpdateTrackPicture";
internal const string UpdatePlayListPicture = "UpdatePlayListPicture";
internal const string UpdateTrackAudio = "UpdateTrackAudio";
}
}
Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
+11 -2
View File
@@ -2,6 +2,8 @@ using MassTransit;
using MassTransit.Courier.Contracts;
using Musify.Application.Events;
using Musify.Infrastructure.Configuration;
using Musify.Infrastructure.MassTransit.Activities.Audio;
using Musify.Infrastructure.MassTransit.Arguments;
using Musify.Infrastructure.MassTransit.Consumers;
using Musify.Infrastructure.Messaging.Activities;
using Musify.Infrastructure.Messaging.Activities.Arguments;
@@ -11,7 +13,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
{
public class AudioWorkflowRoutingSlipBuilder(WorkerConfiguration workerConfiguration)
{
public RoutingSlipBuilder Build(TranscodeAudioFromTrackEvent message, Guid? correlationId)
public RoutingSlipBuilder Build(UpdateTrackAudioEvent message, Guid? correlationId)
{
var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
@@ -49,7 +51,14 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
new TransferFilesToBucketArguments(
message.DestinationBucketName,
RoutingSlipVariableNames.Audio.TranscodedDirectory,
message.DestinationKeyName));
message.DestinationFolderKeyName));
routingSlipBuilder.AddActivity(
ActivityNames.UpdateTrackAudio,
MessagingHelper.BuildExecuteActivityUri(UpdateTrackAudioActivity.ExecuteEndpointName),
new UpdateTrackAudioArguments(
message.TrackId,
message.DestinationFolderKeyName));
return routingSlipBuilder;
}
Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
-5
View File
@@ -130,11 +130,6 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
largePictureWidth,
largePictureHeight);
routingSlipBuilder.AddActivity(
ActivityNames.DeleteOriginal,
MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
new RemoveFileFromBucketArguments(sourceBucketName, sourceKeyName));
routingSlipBuilder.AddActivity(
ActivityNames.UploadFiles,
MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucketActivity.ExecuteEndpointName),
Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.Designer.cs → Infrastructure/Persistence/Migrations/20260325003221_FirstMigration.Designer.cs
Generated
+11 -1
View File
@@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Musify.Infrastructure.Persistence.Migrations
{
[DbContext(typeof(Database))]
[Migration("20260324183733_FirstMigration")]
[Migration("20260325003221_FirstMigration")]
partial class FirstMigration
{
/// <inheritdoc />
@@ -195,6 +195,11 @@ namespace Musify.Infrastructure.Persistence.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("AudioFolderKeyName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<DateTime>("CreatedDate")
.HasColumnType("timestamp with time zone");
@@ -213,6 +218,11 @@ namespace Musify.Infrastructure.Persistence.Migrations
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<string>("OriginalAudioKeyName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("OriginalPictureKeyName")
.IsRequired()
.HasMaxLength(64)
Infrastructure/Persistence/Migrations/20260324183733_FirstMigration.cs → Infrastructure/Persistence/Migrations/20260325003221_FirstMigration.cs
+2
View File
@@ -41,6 +41,8 @@ namespace Musify.Infrastructure.Persistence.Migrations
SmallPictureKeyName = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
MediumPictureKeyName = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
LargePictureKeyName = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
OriginalAudioKeyName = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
AudioFolderKeyName = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
CreatedDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
UpdatedDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
},
Infrastructure/Persistence/Migrations/DatabaseModelSnapshot.cs
+10
View File
@@ -192,6 +192,11 @@ namespace Musify.Infrastructure.Persistence.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("AudioFolderKeyName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<DateTime>("CreatedDate")
.HasColumnType("timestamp with time zone");
@@ -210,6 +215,11 @@ namespace Musify.Infrastructure.Persistence.Migrations
.HasMaxLength(50)
.HasColumnType("character varying(50)");
b.Property<string>("OriginalAudioKeyName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("OriginalPictureKeyName")
.IsRequired()
.HasMaxLength(64)
Infrastructure/Storage/StorageHandler.cs
+5 -4
View File
@@ -80,27 +80,28 @@ namespace Musify.Infrastructure.Storage
string fileName = Path.GetFileName(file);
string filePath = Path.Combine(sourceDirectory, file);
var keyName = Path.Combine(route, fileName);
var upload = new Upload
{
Id = Guid.NewGuid(),
BucketName = bucketName,
KeyName = $"{route}/{fileName}",
KeyName = keyName,
ContentType = "Application/Octet-Stream"
};
await database.Uploads.AddAsync(upload, cancellationToken);
try
{
await trasnsferUtility.UploadAsync(filePath, bucketName, fileName, cancellationToken);
await trasnsferUtility.UploadAsync(filePath, bucketName, keyName, cancellationToken);
upload.State = UploadState.Successful;
successCount++;
logger.LogDebug("Transferred file to S3. Bucket: {BucketName}, Route: {Route}, File: {FileName}", bucketName, route, fileName);
logger.LogDebug("Transferred file to S3. Bucket: {BucketName}, KeyName: {KeyName}", bucketName, keyName);
}
catch (Exception exception)
{
failedCount++;
upload.State = UploadState.Failed;
logger.LogError(exception, "Failed to transfer file to S3. Bucket: {BucketName}, Route: {Route}, File: {FileName}", bucketName, route, fileName);
logger.LogError(exception, "Failed to transfer file to S3. Bucket: {BucketName}, keyName: {keyName}", bucketName, keyName);
}
}