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

Changes on messages

Browse Source
This commit is contained in:
Admin
2026-03-28 21:26:45 +01:00
parent 4e3302c144
commit b39de0d870
25 changed files with 153 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Infrastructure/Audio/AudioTranscoder.cs
+22 -40
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using Ardalis.Result;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Infrastructure.Configuration;
@@ -17,11 +17,7 @@ namespace Musify.Infrastructure.Audio
{
Directory.CreateDirectory(destinationPath);
logger.LogInformation(
"Starting audio transcoding to DASH. DestinationPath={DestinationPath}, Timeout={Timeout}, Executable={Executable}",
destinationPath,
audioTranscoderConfiguration.TranscodingTimeout,
audioTranscoderConfiguration.Ffmpeg.ExecutableName);
logger.LogInformation("Starting audio transcoding to DASH for {DestinationPath}", destinationPath);
var executionResult = await ExecuteFfmpegWithInputAsync(
BuildDashArguments(destinationPath, audioTranscoderConfiguration.Ffmpeg),
@@ -32,25 +28,22 @@ namespace Musify.Infrastructure.Audio
if (executionResult.ExitCode != 0)
{
logger.LogError(
"Audio transcoding to DASH format failed with exit code={ExitCode}. Standard Output={StandardOutput}, Standard Error={StandardError}",
executionResult.ExitCode,
executionResult.StandardOutput,
executionResult.StandardError);
return Result.Error($"Audio transcoding failed with exit code: {executionResult.ExitCode}. See logs for details.");
logger.LogError("Audio transcoding to DASH failed with exit code {ExitCode}. Output: {StandardOutput}, Error: {StandardError}",
executionResult.ExitCode, executionResult.StandardOutput, executionResult.StandardError);
return Result.Error($"Audio transcoding failed (ExitCode: {executionResult.ExitCode})");
}
logger.LogInformation("Audio transcoding to DASH format completed successfully. DestinationPath={DestinationPath}", destinationPath);
logger.LogInformation("Audio transcoding to DASH completed for {DestinationPath}", destinationPath);
return Result.Success();
}
catch (TimeoutException timeoutException)
{
logger.LogError(timeoutException, "Audio transcoding timed out after={Timeout}. DestinationPath={DestinationPath}", audioTranscoderConfiguration.TranscodingTimeout, destinationPath);
return Result.Error("Audio transcoding timed out.");
logger.LogError(timeoutException, "Audio transcoding timed out after {Timeout} for {DestinationPath}", audioTranscoderConfiguration.TranscodingTimeout, destinationPath);
return Result.Error("Audio transcoding timed out");
}
catch (Exception exception)
{
logger.LogError(exception, "An error occurred while transcoding audio to DASH format. DestinationPath={DestinationPath}", destinationPath);
logger.LogError(exception, "Failed to transcode audio to DASH for {DestinationPath}", destinationPath);
return Result.Error(exception.Message);
}
}
@@ -59,13 +52,13 @@ namespace Musify.Infrastructure.Audio
{
if (!File.Exists(filePath))
{
logger.LogWarning("Audio validation requested for a non-existing file. FilePath={FilePath}", filePath);
logger.LogWarning("Audio validation requested for non-existing file {FilePath}", filePath);
return Result<bool>.Error($"Audio file not found: {filePath}");
}
try
{
logger.LogInformation("Starting audio file validation. FilePath={FilePath}, Timeout={Timeout}", filePath, audioTranscoderConfiguration.TranscodingTimeout);
logger.LogDebug("Validating audio file {FilePath}", filePath);
var executionResult = await ExecuteFfmpegAsync(
BuildValidateAudioArguments(filePath),
@@ -76,26 +69,23 @@ namespace Musify.Infrastructure.Audio
var isValid = executionResult.ExitCode == 0;
if (!isValid)
{
logger.LogWarning(
"Audio validation failed for file={FilePath}. Standard Error={StandardError}",
filePath,
executionResult.StandardError);
logger.LogWarning("Audio validation failed for {FilePath}: {StandardError}", filePath, executionResult.StandardError);
}
else
{
logger.LogInformation("Audio validation completed successfully. FilePath={FilePath}", filePath);
logger.LogDebug("Audio validation successful for {FilePath}", filePath);
}
return Result<bool>.Success(isValid);
}
catch (TimeoutException timeoutException)
{
logger.LogError(timeoutException, "Audio validation timed out after={Timeout} for file={FilePath}.", audioTranscoderConfiguration.TranscodingTimeout, filePath);
logger.LogError(timeoutException, "Audio validation timed out for {FilePath}", filePath);
return Result<bool>.Error("Audio validation timed out.");
}
catch (Exception exception)
{
logger.LogError(exception, "An error occurred while validating audio file={FilePath}.", filePath);
logger.LogError(exception, "Failed to validate audio file {FilePath}", filePath);
return Result<bool>.Error(exception.Message);
}
}
@@ -110,7 +100,7 @@ namespace Musify.Infrastructure.Audio
using var process = BuildProcess(arguments, workingDirectory, redirectStandardInput: true);
process.Start();
logger.LogDebug("[{Operation}] ffmpeg process started. ProcessId={ProcessId}, WorkingDirectory={WorkingDirectory}", operationName, process.Id, workingDirectory);
logger.LogDebug("[{Operation}] ffmpeg started (PID: {ProcessId}) in {WorkingDirectory}", operationName, process.Id, workingDirectory);
if (inputStream.CanSeek)
inputStream.Position = 0;
@@ -130,7 +120,7 @@ namespace Musify.Infrastructure.Audio
using var process = BuildProcess(arguments, workingDirectory, redirectStandardInput: false);
process.Start();
logger.LogDebug("[{Operation}] ffmpeg process started. ProcessId={ProcessId}, WorkingDirectory={WorkingDirectory}", operationName, process.Id, workingDirectory);
logger.LogDebug("[{Operation}] ffmpeg started (PID: {ProcessId}) in {WorkingDirectory}", operationName, process.Id, workingDirectory);
return await WaitForProcessResultAsync(process, operationName, cancellationToken);
}
@@ -168,11 +158,8 @@ namespace Musify.Infrastructure.Audio
}
catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
{
logger.LogError(
"[{Operation}] ffmpeg timed out after={Timeout}. ProcessId={ProcessId}",
operationName,
audioTranscoderConfiguration.TranscodingTimeout,
process.Id);
logger.LogError("[{Operation}] ffmpeg timed out after {Timeout} (PID: {ProcessId})",
operationName, audioTranscoderConfiguration.TranscodingTimeout, process.Id);
TryKillProcess(process);
throw new TimeoutException($"ffmpeg execution exceeded timeout {audioTranscoderConfiguration.TranscodingTimeout}.");
@@ -181,13 +168,8 @@ namespace Musify.Infrastructure.Audio
var standardError = await errorTask;
var standardOutput = await outputTask;
logger.LogDebug(
"[{Operation}] ffmpeg finished. ProcessId={ProcessId}, ExitCode={ExitCode}, StdOutLength={StdOutLength}, StdErrLength={StdErrLength}",
operationName,
process.Id,
process.ExitCode,
standardOutput.Length,
standardError.Length);
logger.LogDebug("[{Operation}] ffmpeg finished (PID: {ProcessId}). Exit code: {ExitCode}, Output: {OutputLength}B, Error: {ErrorLength}B",
operationName, process.Id, process.ExitCode, standardOutput.Length, standardError.Length);
return new FfmpegExecutionResult(process.ExitCode, standardOutput, standardError);
}
@@ -201,7 +183,7 @@ namespace Musify.Infrastructure.Audio
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to kill ffmpeg process. ProcessId={ProcessId}", process.Id);
logger.LogError(exception, "Failed to kill ffmpeg process (PID: {ProcessId})", process.Id);
}
}
Infrastructure/Identity/KeycloakUserService.cs
+4 -4
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using Ardalis.Result;
using Keycloak.Net;
using Keycloak.Net.Models.Users;
using Microsoft.Extensions.Logging;
@@ -23,12 +23,12 @@ namespace Musify.Infrastructure.Identity
}
catch (OperationCanceledException)
{
logger.LogError("Operation to retrieve Keycloak user with id={KeycloakId} was cancelled.", keycloakId);
return Result.Error("Operation was cancelled.");
logger.LogWarning("Operation to retrieve Keycloak user {KeycloakId} was cancelled", keycloakId);
return Result.Error("Operation cancelled");
}
catch (Exception exception)
{
logger.LogWarning(exception, "Keycloak user with id={KeycloakId} could not be retrieved.", keycloakId);
logger.LogWarning(exception, "Failed to retrieve Keycloak user {KeycloakId}", keycloakId);
return Result.NotFound();
}
return Result.Success(KeycloakUserMapper.Map(keycloakUser));
Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
+3 -4
View File
@@ -38,9 +38,8 @@ namespace Musify.Infrastructure.MassTransit.Activities
Directory.CreateDirectory(workingDirectory);
logger.LogDebug("Generated audio workflow paths. WorkingDirectory={WorkingDirectory}, SourceFilePath={SourceFilePath}",
workingDirectory,
sourceFilePath);
logger.LogDebug("Generated audio workflow paths in {WorkingDirectory}",
workingDirectory);
await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
return executeContext.CompletedWithVariables(new Dictionary<string, object>
@@ -53,7 +52,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error generating audio workflow paths for key={SourceKey}",
logger.LogError(exception, "Failed to generate audio workflow paths for {SourceKey}",
executeContext.Arguments.SourceKey);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
+5 -5
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -48,7 +48,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (!result.IsSuccess)
{
var errorMessage = string.Join("; ", result.Errors);
logger.LogError("Transcoding failed for file={SourceFilePath}. Errors={ErrorMessage}",
logger.LogError("Transcoding failed for {SourceFilePath}: {Errors}",
sourceFilePath, errorMessage);
throw new Exception(errorMessage);
}
@@ -60,7 +60,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error during transcoding activity for file={SourceFilePath}",
logger.LogError(exception, "Failed to transcode {SourceFilePath}",
sourceFilePath);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
@@ -74,13 +74,13 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (Directory.Exists(compensateContext.Log.WorkingDirectory))
Directory.Delete(compensateContext.Log.WorkingDirectory, recursive: true);
else
logger.LogWarning("Working directory={WorkingDirectory} does not exist during compensation",
logger.LogWarning("Working directory {WorkingDirectory} not found during compensation",
compensateContext.Log.WorkingDirectory);
return Task.FromResult(compensateContext.Compensated());
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating transcoded audio directory={WorkingDirectory}", compensateContext.Log.WorkingDirectory);
logger.LogError(exception, "Failed to compensate transcoded audio directory {WorkingDirectory}", compensateContext.Log.WorkingDirectory);
return Task.FromResult(compensateContext.Failed(exception));
}
}
Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs
+5 -5
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -39,7 +39,7 @@ namespace Musify.Infrastructure.MassTransit.Activities.Audio
if (track is null)
{
logger.LogWarning("Track with id={TrackId} not found",
logger.LogWarning("Track {TrackId} not found",
executeContext.Arguments.TrackId);
throw new InvalidOperationException($"Track with id {executeContext.Arguments.TrackId} not found");
}
@@ -53,7 +53,7 @@ namespace Musify.Infrastructure.MassTransit.Activities.Audio
database.Tracks.Update(track);
await database.SaveChangesAsync(executeContext.CancellationToken);
logger.LogInformation("Updated Track={TrackId} audio",
logger.LogInformation("Updated track {TrackId} audio",
executeContext.Arguments.TrackId);
await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
@@ -61,7 +61,7 @@ namespace Musify.Infrastructure.MassTransit.Activities.Audio
}
catch (Exception exception)
{
logger.LogError(exception, "Error updating Track={TrackId} audio",
logger.LogError(exception, "Failed to update track {TrackId} audio",
executeContext.Arguments.TrackId);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
@@ -90,7 +90,7 @@ namespace Musify.Infrastructure.MassTransit.Activities.Audio
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating Track={TrackId} audio", compensateContext.Log.TrackId);
logger.LogError(exception, "Failed to compensate track {TrackId} audio", compensateContext.Log.TrackId);
return compensateContext.Failed(exception);
}
}
Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
+4 -4
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -44,7 +44,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (!getFile.IsSuccess)
{
var errorMessage = string.Join("; ", getFile.Errors);
logger.LogWarning("Failed to download file from bucket. Bucket={Bucket}, Key={Key}, Errors={Errors}",
logger.LogWarning("Failed to download {Bucket}/{Key}: {Errors}",
executeContext.Arguments.Bucket,
executeContext.Arguments.Key,
errorMessage);
@@ -70,7 +70,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error downloading file from bucket");
logger.LogError(exception, "Failed to download file from bucket");
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
}
@@ -85,7 +85,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating downloaded file={DestinationFilePath}", compensateContext.Log.DestinationFilePath);
logger.LogError(exception, "Failed to compensate downloaded file {DestinationFilePath}", compensateContext.Log.DestinationFilePath);
return Task.FromResult(compensateContext.Failed(exception));
}
}
Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs
+3 -3
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -40,7 +40,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (!removeFile.IsSuccess)
{
var errorMessage = string.Join("; ", removeFile.Errors);
logger.LogWarning("Failed to remove file={Key} from bucket={Bucket}. Errors={Errors}",
logger.LogWarning("Failed to remove {Key} from bucket {Bucket}: {Errors}",
executeContext.Arguments.Key,
executeContext.Arguments.Bucket,
errorMessage);
@@ -51,7 +51,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error removing file={Key} from bucket={Bucket}",
logger.LogError(exception, "Failed to remove {Key} from bucket {Bucket}",
executeContext.Arguments.Key,
executeContext.Arguments.Bucket);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs
+4 -4
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -51,7 +51,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (!transferFilesResult.IsSuccess)
{
var errorMessage = string.Join("; ", transferFilesResult.Errors);
logger.LogWarning("Failed to transfer files from={FolderPath} to bucket={DestinationBucket}, key={DestinationKey}. Errors={Errors}",
logger.LogWarning("Failed to transfer files from {FolderPath} to {DestinationBucket}/{DestinationKey}: {Errors}",
folderPath,
executeContext.Arguments.DestinationBucket,
destinationKey,
@@ -64,7 +64,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error transferring files from={FolderPath} to bucket={DestinationBucket}",
logger.LogError(exception, "Failed to transfer files from {FolderPath} to {DestinationBucket}",
folderPath,
executeContext.Arguments.DestinationBucket);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
@@ -88,7 +88,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating transferred files to bucket={DestinationBucket}", compensateContext.Log.DestinationBucket);
logger.LogError(exception, "Failed to compensate file transfers to {DestinationBucket}", compensateContext.Log.DestinationBucket);
return compensateContext.Failed(exception);
}
}
Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs
+6 -5
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using MimeMapping;
using Musify.Application.Contracts.Infrastructure;
@@ -46,7 +46,7 @@ namespace Musify.Infrastructure.MassTransit.Activities.Files
if (!uploadResult.IsSuccess)
{
var errors = string.Join("; ", uploadResult.Errors);
logger.LogWarning("Failed to upload file to bucket. Bucket={Bucket}, Key={Key}, Errors={Errors}",
logger.LogWarning("Failed to upload file to bucket {Bucket}/{Route}: {Errors}",
executeContext.Arguments.DestinationBucket,
executeContext.Arguments.DestinationRoute,
errors);
@@ -60,7 +60,7 @@ namespace Musify.Infrastructure.MassTransit.Activities.Files
}
catch (Exception exception)
{
logger.LogError(exception, "An error occurred while uploading file to bucket for process={ProcessId} at step={StepId}", processId, stepId);
logger.LogError(exception, "Failed to upload file to bucket for process {ProcessId} step {StepId}", processId, stepId);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
}
@@ -78,7 +78,8 @@ namespace Musify.Infrastructure.MassTransit.Activities.Files
if (!uploadResult.IsSuccess)
{
var errors = string.Join("; ", uploadResult.Errors);
logger.LogError($"Failed to remove file from bucket during compensation. Bucket={compensateContext.Log.DestinationBucket}, Key={compensateContext.Log.DestinationKey}, Errors={errors}");
logger.LogError("Failed to remove file from bucket during compensation. Bucket: {Bucket}, Key: {Key}, Errors: {Errors}",
compensateContext.Log.DestinationBucket, compensateContext.Log.DestinationKey, errors);
return compensateContext.Failed(new Exception($"Failed to remove file from bucket during compensation. Bucket: {compensateContext.Log.DestinationBucket}, Key: {compensateContext.Log.DestinationKey}, Errors: {errors}"));
}
@@ -86,7 +87,7 @@ namespace Musify.Infrastructure.MassTransit.Activities.Files
}
catch (Exception exception)
{
logger.LogError(exception, "An error occurred while compensating upload file to bucket activity for bucket={Bucket} and key={Key}",
logger.LogError(exception, "Error compensating file upload for {Bucket}/{Key}",
compensateContext.Log.DestinationBucket,
compensateContext.Log.DestinationKey);
return compensateContext.Failed(exception);
Infrastructure/MassTransit/Activities/Pictures/GeneratePictureWorkflowPathsActivity.cs
+3 -4
View File
@@ -47,9 +47,8 @@ namespace Musify.Infrastructure.MassTransit.Activities
Directory.CreateDirectory(workingDirectory);
logger.LogDebug("Generated picture workflow paths. WorkingDirectory={WorkingDirectory}, SourceFilePath={SourceFilePath}",
workingDirectory,
sourceFilePath);
logger.LogDebug("Generated picture workflow paths in {WorkingDirectory}",
workingDirectory);
await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
return executeContext.CompletedWithVariables(new Dictionary<string, object>
@@ -64,7 +63,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error generating picture workflow paths for key={SourceKey}",
logger.LogError(exception, "Failed to generate picture workflow paths for {SourceKey}",
executeContext.Arguments.SourceKey);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
+6 -6
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -41,7 +41,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
{
if (!File.Exists(sourceFilePath))
{
logger.LogWarning("Source file not found at={SourceFilePath}", sourceFilePath);
logger.LogWarning("Source file not found: {SourceFilePath}", sourceFilePath);
throw new FileNotFoundException($"Source file not found: {sourceFilePath}");
}
@@ -56,7 +56,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (!resizedPicture.IsSuccess)
{
var errorMessage = string.Join("; ", resizedPicture.Errors);
logger.LogError("Failed to resize picture={SourceFilePath} to={Width}x{Height}. Errors={Errors}",
logger.LogError("Failed to resize picture {SourceFilePath} to {Width}x{Height}: {Errors}",
sourceFilePath,
executeContext.Arguments.Width,
executeContext.Arguments.Height,
@@ -71,7 +71,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
await using var destinationStream = File.Create(destinationFilePath);
await resizedPicture.Value.CopyToAsync(destinationStream, executeContext.CancellationToken);
logger.LogDebug("Picture resized from={SourceFilePath} to={DestinationFilePath}",
logger.LogDebug("Resized picture from {SourceFilePath} to {DestinationFilePath}",
sourceFilePath,
destinationFilePath);
@@ -80,7 +80,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error resizing picture={SourceFilePath}", sourceFilePath);
logger.LogError(exception, "Failed to resize picture {SourceFilePath}", sourceFilePath);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
}
@@ -95,7 +95,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating resized file={DestinationFilePath}", compensateContext.Log.DestinationFilePath);
logger.LogError(exception, "Failed to compensate resized file {DestinationFilePath}", compensateContext.Log.DestinationFilePath);
return Task.FromResult(compensateContext.Failed(exception));
}
}
Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs
+5 -5
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -46,7 +46,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (playList is null)
{
logger.LogWarning("PlayList with id={PlayListId} not found",
logger.LogWarning("Playlist {PlayListId} not found",
executeContext.Arguments.PlayListId);
throw new InvalidOperationException($"PlayList with id {executeContext.Arguments.PlayListId} not found");
}
@@ -66,7 +66,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
database.PlayLists.Update(playList);
await database.SaveChangesAsync(executeContext.CancellationToken);
logger.LogInformation("Updated PlayList={PlayListId} pictures",
logger.LogInformation("Updated playlist {PlayListId} pictures",
executeContext.Arguments.PlayListId);
await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
@@ -74,7 +74,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error updating PlayList={PlayListId} pictures",
logger.LogError(exception, "Failed to update playlist {PlayListId} pictures",
executeContext.Arguments.PlayListId);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
@@ -106,7 +106,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating PlayList={PlayListId} pictures", compensateContext.Log.PlayListId);
logger.LogError(exception, "Failed to compensate playlist {PlayListId} pictures", compensateContext.Log.PlayListId);
return compensateContext.Failed(exception);
}
}
Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
+5 -5
View File
@@ -1,4 +1,4 @@
using MassTransit;
using MassTransit;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Domain.Entities;
@@ -46,7 +46,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
if (track is null)
{
logger.LogWarning("Track with id={TrackId} not found",
logger.LogWarning("Track {TrackId} not found",
executeContext.Arguments.TrackId);
throw new InvalidOperationException($"Track with id {executeContext.Arguments.TrackId} not found");
}
@@ -66,7 +66,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
database.Tracks.Update(track);
await database.SaveChangesAsync(executeContext.CancellationToken);
logger.LogInformation("Updated Track={TrackId} pictures",
logger.LogInformation("Updated track {TrackId} pictures",
executeContext.Arguments.TrackId);
await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
@@ -74,7 +74,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error updating Track={TrackId} pictures",
logger.LogError(exception, "Failed to update track {TrackId} pictures",
executeContext.Arguments.TrackId);
await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
throw;
@@ -106,7 +106,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
}
catch (Exception exception)
{
logger.LogError(exception, "Error compensating Track={TrackId} pictures", compensateContext.Log.TrackId);
logger.LogError(exception, "Failed to compensate track {TrackId} pictures", compensateContext.Log.TrackId);
return compensateContext.Failed(exception);
}
}
Infrastructure/Pictures/PictureHandler.cs
+5 -5
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using Ardalis.Result;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using SixLabors.ImageSharp;
@@ -13,7 +13,7 @@ namespace Musify.Infrastructure.Pictures
{
try
{
logger.LogDebug("Resizing picture to={Width}x{Height}", width, height);
logger.LogDebug("Resizing picture to {Width}x{Height}", width, height);
if (pictureStream.CanSeek && pictureStream.Position > 0)
pictureStream.Position = 0;
@@ -31,13 +31,13 @@ namespace Musify.Infrastructure.Pictures
memoryStream.Position = 0;
logger.LogDebug("Picture resized successfully. OutputLength={Length}", memoryStream.Length);
logger.LogDebug("Picture resized to {Width}x{Height}, length: {Length}", width, height, memoryStream.Length);
return Result<Stream>.Success(memoryStream);
}
catch (Exception exception)
{
logger.LogError(exception, "An error occurred while resizing the picture to={Width}x{Height}.", width, height);
return Result.Error("An error occurred while resizing the picture.");
logger.LogError(exception, "Failed to resize picture to {Width}x{Height}", width, height);
return Result.Error("Failed to resize picture");
}
}
}
Infrastructure/Storage/StorageHandler.cs
+19 -19
View File
@@ -1,4 +1,4 @@
using Amazon.S3;
using Amazon.S3;
using Amazon.S3.Model;
using Amazon.S3.Transfer;
using Ardalis.Result;
@@ -21,19 +21,19 @@ namespace Musify.Infrastructure.Storage
Key = key,
};
logger.LogDebug("Getting file from S3. Bucket={Bucket}, Key={Key}", bucket, key);
try
{
var response = await amazonS3.GetObjectAsync(request, cancellationToken);
logger.LogDebug("Successfully got file from S3 with bucket={Bucket} and key={Key}", bucket, key);
logger.LogDebug("Retrieved file from S3 {Bucket}/{Key}", bucket, key);
return Result.Success(response.ResponseStream);
}
catch (Exception exception)
{
logger.LogWarning(exception, "Failed to get file from S3. Bucket={Bucket}, Key={Key}", bucket, key);
return Result.NotFound($"File not found in S3 with bucket: {bucket} and key: {key}");
logger.LogWarning(exception, "Failed to get file from S3 {Bucket}/{Key}", bucket, key);
return Result.NotFound($"File {bucket}/{key} not found");
}
}
@@ -47,7 +47,7 @@ namespace Musify.Infrastructure.Storage
Protocol = storageClientConfiguration.UseHttp ? Protocol.HTTP : Protocol.HTTPS
};
logger.LogDebug("Getting pre-signed URL from S3. Bucket={BucketName}, Key={Key}, Expires={Expires}", bucket, key, request.Expires);
logger.LogDebug("Generating pre-signed URL for {Bucket}/{Key}", bucket, key);
var url = await amazonS3.GetPreSignedURLAsync(request);
return url;
@@ -61,7 +61,7 @@ namespace Musify.Infrastructure.Storage
Key = key,
};
logger.LogDebug("Removing file from S3. Bucket={Bucket}, Key={Key}", bucket, key);
logger.LogDebug("Removing file from S3 {Bucket}/{Key}", bucket, key);
var response = await amazonS3.DeleteObjectAsync(request, cancellationToken);
return Result.NoContent();
@@ -96,18 +96,18 @@ namespace Musify.Infrastructure.Storage
await trasnsferUtility.UploadAsync(filePath, bucket, key, cancellationToken);
upload.State = UploadState.Successful;
successCount++;
logger.LogDebug("Transferred file to S3. Bucket={Bucket}, Key={Key}", bucket, key);
logger.LogDebug("Transferred file to S3 {Bucket}/{Key}", bucket, key);
}
catch (Exception exception)
{
failedCount++;
upload.State = UploadState.Failed;
logger.LogError(exception, "Failed to transfer file to S3. Bucket={Bucket}, key={key}", bucket, key);
logger.LogError(exception, "Failed to transfer file to S3 {Bucket}/{Key}", bucket, key);
}
}
await database.SaveChangesAsync(cancellationToken);
logger.LogInformation("TransferFiles completed. Bucket={Bucket}, Route={Route}, Success={SuccessCount}, Failed={FailedCount}", bucket, route, successCount, failedCount);
logger.LogInformation("File transfer completed to {Bucket}/{Route}. Success: {SuccessCount}, Failed: {FailedCount}", bucket, route, successCount, failedCount);
return Result.Success();
}
@@ -122,8 +122,8 @@ namespace Musify.Infrastructure.Storage
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to upload file to S3 with bucket={Bucket} and key={Key}", bucket, key);
return Result.Error($"Failed to upload file to S3 with bucket: {bucket} and key: {key}");
logger.LogError(exception, "Failed to upload file to S3 {Bucket}/{Key}", bucket, key);
return Result.Error($"Failed to upload to {bucket}/{key}");
}
}
@@ -149,18 +149,18 @@ namespace Musify.Infrastructure.Storage
try
{
var response = await amazonS3.PutObjectAsync(request, cancellationToken);
logger.LogDebug("Uploaded file to S3. Bucket?={Bucket}, Key={Key}", bucket, key);
logger.LogDebug("Uploaded file to S3 {Bucket}/{Key}", bucket, key);
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to upload file to S3 with bucket={Bucket} and key={Key}", bucket, key);
logger.LogError(exception, "Failed to upload file to S3 {Bucket}/{Key}", bucket, key);
upload.State = UploadState.Failed;
return Result.Error($"Failed to upload file to S3 with bucket: {bucket} and key: {key}");
return Result.Error($"Failed to upload to {bucket}/{key}");
}
upload.State = UploadState.Successful;
await database.SaveChangesAsync(cancellationToken);
logger.LogDebug("Saved upload record to database. Bucket={Bucket}, Key={Key}", bucket, key);
logger.LogDebug("Saved upload record for {Bucket}/{Key}", bucket, key);
return Result.Success(key);
}
@@ -179,15 +179,15 @@ namespace Musify.Infrastructure.Storage
try
{
var response = await amazonS3.CopyObjectAsync(request, cancellationToken);
logger.LogInformation("Successfully copied file from S3 with bucket={SourceBucket} and key={SourceKey} to bucket={DestinationBucket} and key={DestinationKey}",
logger.LogInformation("Copied file from {SourceBucket}/{SourceKey} to {DestinationBucket}/{DestinationKey}",
sourceBucket, sourceKey, destinationBucket, destinationKey);
return Result.Success();
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to copy file from S3 with bucket={SourceBucket} and key={SourceKey} to bucket={DestinationBucket} and key={DestinationKey}",
logger.LogError(exception, "Failed to copy file from {SourceBucket}/{SourceKey} to {DestinationBucket}/{DestinationKey}",
sourceBucket, sourceKey, destinationBucket, destinationKey);
return Result.Error($"Failed to copy file from S3 with bucket: {sourceBucket} and key: {sourceKey} to bucket: {destinationBucket} and key: {destinationKey}");
return Result.Error($"Failed to copy from {sourceBucket}/{sourceKey} to {destinationBucket}/{destinationKey}");
}
}
}