From 4e089c4da81a55fc3c3a8ff6573abbcd688c966c Mon Sep 17 00:00:00 2001 From: XShine555 Date: Mon, 23 Mar 2026 09:48:15 +0100 Subject: [PATCH] Download once --- .../Events/UpdatePlayListPictureEvent.cs | 4 +-- .../UpdatePlayListPictureConsumer.cs | 34 +++++++++---------- .../Consumers/UpdateTrackPictureConsumer.cs | 17 ++++------ 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/Application/Events/UpdatePlayListPictureEvent.cs b/Application/Events/UpdatePlayListPictureEvent.cs index f5590d9..5441f85 100644 --- a/Application/Events/UpdatePlayListPictureEvent.cs +++ b/Application/Events/UpdatePlayListPictureEvent.cs @@ -2,8 +2,8 @@ { public record UpdatePlayListPictureEvent( Guid PlayListId, - string BucketName, - string OriginalPictureKeyName, + string SourceBucketName, + string SourceKeyName, string SmallPictureKeyName, int SmallPictureWidth, int SmallPictureHeight, diff --git a/Infrastructure/Messaging/Consumers/UpdatePlayListPictureConsumer.cs b/Infrastructure/Messaging/Consumers/UpdatePlayListPictureConsumer.cs index fbaa479..fc72103 100644 --- a/Infrastructure/Messaging/Consumers/UpdatePlayListPictureConsumer.cs +++ b/Infrastructure/Messaging/Consumers/UpdatePlayListPictureConsumer.cs @@ -19,14 +19,22 @@ namespace Musify.Infrastructure.Messaging.Consumers var folderName = Guid.NewGuid().ToString(); var workingDirectory = Path.Combine(audioTranscoderConfiguration.Routes.WorkingDirectory, folderName); + routingSlipBuilder.AddActivity( + "DownloadFile", + MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName), + new DownloadFileFromBucketArguments( + consumeContext.Message.SourceBucketName, + consumeContext.Message.SourceKeyName, + workingDirectory)); + AddResizeActivity( routingSlipBuilder, "ResizeSmall", consumeContext.Message.SmallPictureKeyName, consumeContext.Message.SmallPictureWidth, consumeContext.Message.SmallPictureHeight, - consumeContext.Message.OriginalPictureKeyName, - consumeContext.Message.BucketName, + consumeContext.Message.SourceKeyName, + consumeContext.Message.SourceBucketName, workingDirectory); AddResizeActivity( @@ -35,8 +43,8 @@ namespace Musify.Infrastructure.Messaging.Consumers consumeContext.Message.MediumPictureKeyName, consumeContext.Message.MediumPictureWidth, consumeContext.Message.MediumPictureHeight, - consumeContext.Message.OriginalPictureKeyName, - consumeContext.Message.BucketName, + consumeContext.Message.SourceKeyName, + consumeContext.Message.SourceBucketName, workingDirectory); AddResizeActivity( @@ -45,23 +53,23 @@ namespace Musify.Infrastructure.Messaging.Consumers consumeContext.Message.LargePictureKeyName, consumeContext.Message.LargePictureWidth, consumeContext.Message.LargePictureHeight, - consumeContext.Message.OriginalPictureKeyName, - consumeContext.Message.BucketName, + consumeContext.Message.SourceKeyName, + consumeContext.Message.SourceBucketName, workingDirectory); routingSlipBuilder.AddActivity( "DeleteOriginal", MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName), new RemoveFileFromBucketArguments( - consumeContext.Message.BucketName, - consumeContext.Message.OriginalPictureKeyName)); + consumeContext.Message.SourceBucketName, + consumeContext.Message.SourceKeyName)); routingSlipBuilder.AddActivity( "UploadFiles", MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName), new TransferFilesToBucketArguments( workingDirectory, - consumeContext.Message.BucketName, + consumeContext.Message.SourceBucketName, folderName)); routingSlipBuilder.AddActivity( @@ -92,14 +100,6 @@ namespace Musify.Infrastructure.Messaging.Consumers var destinationFileName = Path.GetFileNameWithoutExtension(destinationKeyName) + Path.GetExtension(fileName); var destinationFilePath = Path.Combine(workingDirectory, destinationFileName); - routingSlipBuilder.AddActivity( - $"{activityName}_Download", - MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName), - new DownloadFileFromBucketArguments( - bucketName, - originalPictureKeyName, - workingDirectory)); - routingSlipBuilder.AddActivity( activityName, MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName), diff --git a/Infrastructure/Messaging/Consumers/UpdateTrackPictureConsumer.cs b/Infrastructure/Messaging/Consumers/UpdateTrackPictureConsumer.cs index 8133f6d..45f5942 100644 --- a/Infrastructure/Messaging/Consumers/UpdateTrackPictureConsumer.cs +++ b/Infrastructure/Messaging/Consumers/UpdateTrackPictureConsumer.cs @@ -57,6 +57,13 @@ namespace Musify.Infrastructure.Messaging.Consumers consumeContext.Message.SourceBucketName, workingDirectory); + routingSlipBuilder.AddActivity( + "DeleteOriginal", + MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName), + new RemoveFileFromBucketArguments( + consumeContext.Message.SourceBucketName, + consumeContext.Message.SourceKeyName)); + routingSlipBuilder.AddActivity( "UploadFiles", MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName), @@ -93,16 +100,6 @@ namespace Musify.Infrastructure.Messaging.Consumers var destinationFileName = Path.GetFileNameWithoutExtension(destinationKeyName) + Path.GetExtension(fileName); var destinationFilePath = Path.Combine(workingDirectory, destinationFileName); - // First: Download original file - routingSlipBuilder.AddActivity( - $"{activityName}_Download", - MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName), - new DownloadFileFromBucketArguments( - bucketName, - originalPictureKeyName, - workingDirectory)); - - // Second: Resize picture routingSlipBuilder.AddActivity( activityName, MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),