Changes
This commit is contained in:
@@ -35,9 +35,7 @@ namespace Musify.Infrastructure.Messaging.Activities
|
||||
var workingDirectory = executeContext.GetVariable<string>(executeContext.Arguments.WorkingDirectoryVariableName);
|
||||
|
||||
if (string.IsNullOrWhiteSpace(sourceFilePath) || string.IsNullOrWhiteSpace(workingDirectory))
|
||||
{
|
||||
throw new InvalidOperationException("Transcode activity requires source file path and working directory variables.");
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
@@ -72,11 +70,7 @@ namespace Musify.Infrastructure.Messaging.Activities
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Directory.Exists(compensateContext.Log.WorkingDirectory))
|
||||
{
|
||||
Directory.Delete(compensateContext.Log.WorkingDirectory, true);
|
||||
}
|
||||
|
||||
Directory.Delete(compensateContext.Log.WorkingDirectory, recursive: true);
|
||||
return Task.FromResult(compensateContext.Compensated());
|
||||
}
|
||||
catch (Exception exception)
|
||||
|
||||
@@ -57,9 +57,7 @@ namespace Musify.Infrastructure.Messaging.Activities
|
||||
|
||||
var destinationDirectory = Path.GetDirectoryName(destinationPath);
|
||||
if (!string.IsNullOrWhiteSpace(destinationDirectory))
|
||||
{
|
||||
Directory.CreateDirectory(destinationDirectory);
|
||||
}
|
||||
|
||||
using var fileStream = getFile.Value;
|
||||
if (fileStream.CanSeek)
|
||||
@@ -82,12 +80,8 @@ namespace Musify.Infrastructure.Messaging.Activities
|
||||
public Task<CompensationResult> Compensate(CompensateContext<DownloadFileFromBucketLog> compensateContext)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (File.Exists(compensateContext.Log.DestinationFilePath))
|
||||
{
|
||||
File.Delete(compensateContext.Log.DestinationFilePath);
|
||||
}
|
||||
|
||||
return Task.FromResult(compensateContext.Compensated());
|
||||
}
|
||||
catch (Exception exception)
|
||||
|
||||
@@ -33,21 +33,15 @@ namespace Musify.Infrastructure.Messaging.Activities
|
||||
|
||||
var folderPath = executeContext.GetVariable<string>(executeContext.Arguments.SourceDirectoryVariableName);
|
||||
if (string.IsNullOrWhiteSpace(folderPath))
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
$"Transfer activity requires variable '{executeContext.Arguments.SourceDirectoryVariableName}' with source directory path.");
|
||||
}
|
||||
|
||||
var destinationKeyName = executeContext.Arguments.DestinationKeyName;
|
||||
if (string.IsNullOrWhiteSpace(destinationKeyName) && !string.IsNullOrWhiteSpace(executeContext.Arguments.DestinationKeyNameVariableName))
|
||||
{
|
||||
destinationKeyName = executeContext.GetVariable<string>(executeContext.Arguments.DestinationKeyNameVariableName);
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(destinationKeyName))
|
||||
{
|
||||
throw new InvalidOperationException("Transfer activity requires a destination key name from arguments or variables.");
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
@@ -35,9 +35,7 @@ namespace Musify.Infrastructure.Messaging.Activities
|
||||
var destinationFilePath = executeContext.GetVariable<string>(executeContext.Arguments.DestinationFilePathVariableName);
|
||||
|
||||
if (string.IsNullOrWhiteSpace(sourceFilePath) || string.IsNullOrWhiteSpace(destinationFilePath))
|
||||
{
|
||||
throw new InvalidOperationException("Resize activity requires source and destination file path variables.");
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
@@ -95,12 +93,8 @@ namespace Musify.Infrastructure.Messaging.Activities
|
||||
public Task<CompensationResult> Compensate(CompensateContext<ResizePictureLog> compensateContext)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (File.Exists(compensateContext.Log.DestinationFilePath))
|
||||
{
|
||||
File.Delete(compensateContext.Log.DestinationFilePath);
|
||||
}
|
||||
|
||||
return Task.FromResult(compensateContext.Compensated());
|
||||
}
|
||||
catch (Exception exception)
|
||||
|
||||
@@ -3,6 +3,7 @@ using Musify.Application.Events;
|
||||
using Musify.Infrastructure.Configuration;
|
||||
using Musify.Infrastructure.Messaging.Activities;
|
||||
using Musify.Infrastructure.Messaging.Activities.Arguments;
|
||||
using Musify.Infrastructure.Messaging.Consumers;
|
||||
|
||||
namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
{
|
||||
@@ -16,14 +17,14 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.GenerateAudioWorkflowPaths,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(GenerateAudioWorkflowPathsActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(GenerateAudioWorkflowPathsActivity.ExecuteEndpointName),
|
||||
new GenerateAudioWorkflowPathsArguments(
|
||||
workerConfiguration.Routes.TemporaryFilesDirectory,
|
||||
message.SourceKeyName));
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.DownloadFile,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
|
||||
new DownloadFileFromBucketArguments(
|
||||
message.SourceBucketName,
|
||||
message.SourceKeyName,
|
||||
@@ -31,14 +32,14 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.TranscodeAudio,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
|
||||
new TranscodeDashAudioArguments(
|
||||
RoutingSlipVariableNames.Audio.SourceFilePath,
|
||||
RoutingSlipVariableNames.Workflow.TempDirectory));
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.UploadFiles,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
|
||||
new TransferFilesToBucketArguments(
|
||||
message.DestinationBucketName,
|
||||
RoutingSlipVariableNames.Audio.TranscodedDirectory,
|
||||
|
||||
+8
-7
@@ -3,6 +3,7 @@ using Musify.Application.Events;
|
||||
using Musify.Infrastructure.Configuration;
|
||||
using Musify.Infrastructure.Messaging.Activities;
|
||||
using Musify.Infrastructure.Messaging.Activities.Arguments;
|
||||
using Musify.Infrastructure.Messaging.Consumers;
|
||||
|
||||
namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
{
|
||||
@@ -26,7 +27,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.UpdateTrackPicture,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
|
||||
new UpdateTrackPictureArguments(
|
||||
message.TrackId,
|
||||
message.SourceKeyName,
|
||||
@@ -55,7 +56,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.UpdatePlayListPicture,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
|
||||
new UpdatePlayListPictureArguments(
|
||||
message.PlayListId,
|
||||
message.SourceKeyName,
|
||||
@@ -86,7 +87,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.GeneratePictureWorkflowPaths,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(GeneratePictureWorkflowPathsActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(GeneratePictureWorkflowPathsActivity.ExecuteEndpointName),
|
||||
new GeneratePictureWorkflowPathsArguments(
|
||||
workerConfiguration.Routes.TemporaryFilesDirectory,
|
||||
sourceKeyName,
|
||||
@@ -96,7 +97,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.DownloadFile,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
|
||||
new DownloadFileFromBucketArguments(
|
||||
sourceBucketName,
|
||||
sourceKeyName,
|
||||
@@ -125,12 +126,12 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.DeleteOriginal,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
|
||||
new RemoveFileFromBucketArguments(sourceBucketName, sourceKeyName));
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.UploadFiles,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
|
||||
new TransferFilesToBucketArguments(
|
||||
sourceBucketName,
|
||||
RoutingSlipVariableNames.Workflow.TempDirectory,
|
||||
@@ -148,7 +149,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
{
|
||||
routingSlipBuilder.AddActivity(
|
||||
activityName,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
|
||||
new ResizePictureLocalArguments(
|
||||
RoutingSlipVariableNames.Picture.OriginalFilePath,
|
||||
destinationFilePathVariableName,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using MassTransit;
|
||||
using Musify.Application.Events;
|
||||
using Musify.Infrastructure.Messaging.Activities;
|
||||
using Musify.Infrastructure.Messaging.Consumers;
|
||||
|
||||
namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
{
|
||||
@@ -14,7 +15,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
|
||||
|
||||
routingSlipBuilder.AddActivity(
|
||||
ActivityNames.RemoveFile,
|
||||
Consumers.MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
|
||||
MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
|
||||
new Activities.Arguments.RemoveFileFromBucketArguments(
|
||||
message.BucketName,
|
||||
message.KeyName));
|
||||
|
||||
Reference in New Issue
Block a user