Changes but failing

2026-03-23 03:13:08 +01:00
parent d771c6c0a7
commit 9eb6fa826e
16 changed files with 362 additions and 160 deletions
@@ -0,0 +1,7 @@
+namespace Musify.Infrastructure.Messaging.Consumers
+{
+    internal static class MessagingHelper
+    {
+        internal static Uri BuildExecuteActivityUri(string endpointName) => new($"queue:{endpointName}_execute");
+    }
+}
@@ -16,7 +16,7 @@ namespace Musify.Infrastructure.Messaging.Consumers

            routingSlipBuilder.AddActivity(
                "RemoveFile",
-                BuildExecuteUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                new RemoveFileFromBucketArguments(
                    consumeContext.Message.BucketName,
                    consumeContext.Message.KeyName));
@@ -24,7 +24,5 @@ namespace Musify.Infrastructure.Messaging.Consumers
            var routingSlip = routingSlipBuilder.Build();
            await bus.Execute(routingSlip);
        }
-
-        static Uri BuildExecuteUri(string endpointName) => new($"queue:{endpointName}_execute");
    }
 }
@@ -6,7 +6,9 @@ using Musify.Infrastructure.Messaging.Activities.Arguments;

 namespace Musify.Infrastructure.Messaging.Consumers
 {
-    public class TranscodeAudioFromTrackConsumer(IBus bus, AudioTranscoderConfiguration audioTranscoderConfiguration)
+    public class TranscodeAudioFromTrackConsumer(
+        IBus bus,
+        AudioTranscoderConfiguration audioTranscoderConfiguration)
        : IConsumer<TranscodeAudioFromTrackEvent>
    {
        public const string QueueName = "Transcode-Audio-From-Track";
@@ -14,41 +16,35 @@ namespace Musify.Infrastructure.Messaging.Consumers
        public async Task Consume(ConsumeContext<TranscodeAudioFromTrackEvent> consumeContext)
        {
            var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-
+            var fileName = Path.GetFileName(consumeContext.Message.SourceKeyName);
            var folderName = Guid.NewGuid().ToString();
-            var workingDirectory = Path.Combine("D:\\tempsFilesDev\\");
+            var workingDirectory = Path.Combine(audioTranscoderConfiguration.Routes.WorkingDirectory, folderName);

            routingSlipBuilder.AddActivity(
                "DownloadFile",
-                BuildExecuteUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
                new DownloadFileFromBucketArguments(
                    consumeContext.Message.SourceBucketName,
                    consumeContext.Message.SourceKeyName,
-                    workingDirectory)
-                );
-            var fileName = Path.GetFileName(consumeContext.Message.SourceKeyName);
+                    workingDirectory));

            routingSlipBuilder.AddActivity(
                "TranscodeAudio",
-                BuildExecuteUri(TranscodeDashAudioActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
                new TranscodeDashAudioArguments(
-                    $"D:\\tempsFilesDev\\{fileName}",
-                    "D:\\tempsFilesDev\\")
-                );
+                    Path.Combine(workingDirectory, fileName),
+                    folderName));

            routingSlipBuilder.AddActivity(
                "UploadFile",
-                BuildExecuteUri(TransferFilesToBucket.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
                new TransferFilesToBucketArguments(
                    workingDirectory,
                    consumeContext.Message.DestinationBucketName,
-                    consumeContext.Message.DestinationKeyName)
-                );
+                    consumeContext.Message.DestinationKeyName));

            var routingSlip = routingSlipBuilder.Build();
            await bus.Execute(routingSlip);
        }
-
-        static Uri BuildExecuteUri(string endpointName) => new($"queue:{endpointName}_execute");
    }
 }
@@ -1,11 +1,14 @@
 using MassTransit;
 using Musify.Application.Events;
+using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.Messaging.Activities;
 using Musify.Infrastructure.Messaging.Activities.Arguments;

 namespace Musify.Infrastructure.Messaging.Consumers
 {
-    public class UpdatePlayListPictureConsumer(IBus bus)
+    public class UpdatePlayListPictureConsumer(
+        IBus bus,
+        AudioTranscoderConfiguration audioTranscoderConfiguration)
        : IConsumer<UpdatePlayListPictureEvent>
    {
        public const string QueueName = "Update-PlayList-Picture";
@@ -13,6 +16,8 @@ namespace Musify.Infrastructure.Messaging.Consumers
        public async Task Consume(ConsumeContext<UpdatePlayListPictureEvent> consumeContext)
        {
            var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
+            var folderName = Guid.NewGuid().ToString();
+            var workingDirectory = Path.Combine(audioTranscoderConfiguration.Routes.WorkingDirectory, folderName);

            AddResizeActivity(
                routingSlipBuilder,
@@ -21,7 +26,8 @@ namespace Musify.Infrastructure.Messaging.Consumers
                consumeContext.Message.SmallPictureWidth,
                consumeContext.Message.SmallPictureHeight,
                consumeContext.Message.OriginalPictureKeyName,
-                consumeContext.Message.BucketName);
+                consumeContext.Message.BucketName,
+                workingDirectory);

            AddResizeActivity(
                routingSlipBuilder,
@@ -30,7 +36,8 @@ namespace Musify.Infrastructure.Messaging.Consumers
                consumeContext.Message.MediumPictureWidth,
                consumeContext.Message.MediumPictureHeight,
                consumeContext.Message.OriginalPictureKeyName,
-                consumeContext.Message.BucketName);
+                consumeContext.Message.BucketName,
+                workingDirectory);

            AddResizeActivity(
                routingSlipBuilder,
@@ -39,19 +46,27 @@ namespace Musify.Infrastructure.Messaging.Consumers
                consumeContext.Message.LargePictureWidth,
                consumeContext.Message.LargePictureHeight,
                consumeContext.Message.OriginalPictureKeyName,
-                consumeContext.Message.BucketName);
+                consumeContext.Message.BucketName,
+                workingDirectory);

            routingSlipBuilder.AddActivity(
                "DeleteOriginal",
-                BuildExecuteUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                new RemoveFileFromBucketArguments(
                    consumeContext.Message.BucketName,
-                    consumeContext.Message.OriginalPictureKeyName)
-                );
+                    consumeContext.Message.OriginalPictureKeyName));
+
+            routingSlipBuilder.AddActivity(
+                "UploadFiles",
+                MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
+                new TransferFilesToBucketArguments(
+                    workingDirectory,
+                    consumeContext.Message.BucketName,
+                    folderName));

            routingSlipBuilder.AddActivity(
                "UpdatePlayListPicture",
-                BuildExecuteUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
                new UpdatePlayListPictureArguments(
                    consumeContext.Message.PlayListId,
                    consumeContext.Message.SmallPictureKeyName,
@@ -69,20 +84,32 @@ namespace Musify.Infrastructure.Messaging.Consumers
            int width,
            int height,
            string originalPictureKeyName,
-            string bucketName)
+            string bucketName,
+            string workingDirectory)
        {
+            var fileName = Path.GetFileName(originalPictureKeyName);
+            var sourceFilePath = Path.Combine(workingDirectory, fileName);
+            var destinationFileName = Path.GetFileNameWithoutExtension(destinationKeyName) + Path.GetExtension(fileName);
+            var destinationFilePath = Path.Combine(workingDirectory, destinationFileName);
+
+            // First: Download original file
            routingSlipBuilder.AddActivity(
-                activityName,
-                BuildExecuteUri(ResizePictureActivity.ExecuteEndpointName),
-                new ResizePictureArgument(
+                $"{activityName}_Download",
+                MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
+                new DownloadFileFromBucketArguments(
                    bucketName,
                    originalPictureKeyName,
-                    bucketName,
-                    destinationKeyName,
+                    workingDirectory));
+
+            // Second: Resize picture
+            routingSlipBuilder.AddActivity(
+                activityName,
+                MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
+                new ResizePictureLocalArguments(
+                    sourceFilePath,
+                    destinationFilePath,
                    width,
                    height));
        }
-
-        static Uri BuildExecuteUri(string endpointName) => new($"queue:{endpointName}_execute");
    }
 }
@@ -1,18 +1,31 @@
 using MassTransit;
 using Musify.Application.Events;
+using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.Messaging.Activities;
 using Musify.Infrastructure.Messaging.Activities.Arguments;

 namespace Musify.Infrastructure.Messaging.Consumers
 {
-    public class UpdateTrackPictureConsumer(IBus bus)
+    public class UpdateTrackPictureConsumer(
+        IBus bus,
+        AudioTranscoderConfiguration audioTranscoderConfiguration)
        : IConsumer<UpdateTrackPictureEvent>
    {
-        public const string QueueName = "update-track-picture";
+        public const string QueueName = "Update-Track-Picture";

        public async Task Consume(ConsumeContext<UpdateTrackPictureEvent> consumeContext)
        {
            var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
+            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,
@@ -20,38 +33,41 @@ namespace Musify.Infrastructure.Messaging.Consumers
                consumeContext.Message.SmallPictureKeyName,
                consumeContext.Message.SmallPictureWidth,
                consumeContext.Message.SmallPictureHeight,
-                consumeContext.Message.OriginalPictureKeyName,
-                consumeContext.Message.BucketName);
+                consumeContext.Message.SourceKeyName,
+                consumeContext.Message.SourceBucketName,
+                workingDirectory);

            AddResizeActivity(
                routingSlipBuilder,
                "ResizeMedium",
-                consumeContext.Message.SmallPictureKeyName,
+                consumeContext.Message.MediumPictureKeyName,
                consumeContext.Message.MediumPictureWidth,
                consumeContext.Message.MediumPictureHeight,
-                consumeContext.Message.OriginalPictureKeyName,
-                consumeContext.Message.BucketName);
+                consumeContext.Message.SourceKeyName,
+                consumeContext.Message.SourceBucketName,
+                workingDirectory);

            AddResizeActivity(
                routingSlipBuilder,
-                "ResizeMedium",
-                consumeContext.Message.SmallPictureKeyName,
+                "ResizeLarge",
+                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",
-                BuildExecuteUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                new RemoveFileFromBucketArguments(
-                    consumeContext.Message.BucketName,
-                    consumeContext.Message.OriginalPictureKeyName)
-                );
+                "UploadFiles",
+                MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
+                new TransferFilesToBucketArguments(
+                    workingDirectory,
+                    consumeContext.Message.SourceBucketName,
+                    folderName));

            routingSlipBuilder.AddActivity(
-                "UpdateTrackPictureActivity",
-                BuildExecuteUri(UpdateTrackPictureActivity.ExecuteEndpointName),
+                "UpdateTrackPicture",
+                MessagingHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
                new UpdateTrackPictureArguments(
                    consumeContext.Message.TrackId,
                    consumeContext.Message.SmallPictureKeyName,
@@ -69,20 +85,32 @@ namespace Musify.Infrastructure.Messaging.Consumers
            int width,
            int height,
            string originalPictureKeyName,
-            string bucketName)
+            string bucketName,
+            string workingDirectory)
        {
+            var fileName = Path.GetFileName(originalPictureKeyName);
+            var sourceFilePath = Path.Combine(workingDirectory, fileName);
+            var destinationFileName = Path.GetFileNameWithoutExtension(destinationKeyName) + Path.GetExtension(fileName);
+            var destinationFilePath = Path.Combine(workingDirectory, destinationFileName);
+
+            // First: Download original file
            routingSlipBuilder.AddActivity(
-                activityName,
-                BuildExecuteUri(ResizePictureActivity.ExecuteEndpointName),
-                new ResizePictureArgument(
+                $"{activityName}_Download",
+                MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
+                new DownloadFileFromBucketArguments(
                    bucketName,
                    originalPictureKeyName,
-                    bucketName,
-                    destinationKeyName,
+                    workingDirectory));
+
+            // Second: Resize picture
+            routingSlipBuilder.AddActivity(
+                activityName,
+                MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
+                new ResizePictureLocalArguments(
+                    sourceFilePath,
+                    destinationFilePath,
                    width,
                    height));
        }
-
-        static Uri BuildExecuteUri(string endpointName) => new($"queue:{endpointName}_execute");
    }
 }