feat: enhance image upload functionality and update dependencies

csharpfritz · csharpfritz · commit 82880fe14bec · 2025-06-13T14:45:10.000-04:00
diff --git a/Shared/ImageUploadHelper.cs b/Shared/ImageUploadHelper.cs
@@ -19,7 +19,8 @@ public static async Task<ImageInfo> ProcessAndUploadImageAsync(string imagePath,
         await containerClient.CreateIfNotExistsAsync(PublicAccessType.Blob);
 
         // Process image and get metadata
-        using var image = await Image.LoadAsync(imagePath);        var imageInfo = new ImageInfo
+        using var image = await Image.LoadAsync(imagePath);
+				var imageInfo = new ImageInfo
         {
             FileName = fileName,
             ImageId = imageId,
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Data.Tables" Version="12.11.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.24.1" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.9" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
diff --git a/Web/Extensions/ImageUrlRewriterExtension.cs b/Web/Extensions/ImageUrlRewriterExtension.cs
@@ -3,6 +3,7 @@
 using Markdig.Renderers.Html;
 using Markdig.Syntax;
 using Markdig.Syntax.Inlines;
+using Web.Services;
 
 namespace Web.Extensions;
 
diff --git a/Web/Services/ContentService.cs b/Web/Services/ContentService.cs
@@ -5,6 +5,7 @@
 using YamlDotNet.Serialization.NamingConventions;
 using Azure.Data.Tables;
 using Shared;
+using Web.Extensions;
 
 namespace Web.Services;
 
@@ -33,9 +34,7 @@ public ContentService(
         _logger = logger;
         _environment = environment;
         _cache = cache;
-        _imageService = imageService;
-
-        // Configure Markdig with image processing
+        _imageService = imageService;        // Configure Markdig with image processing
         _markdownPipeline = new MarkdownPipelineBuilder()
             .UseAutoLinks()
             .UseEmphasisExtras()
@@ -55,7 +54,7 @@ public ContentService(
             .UseFigures()
             .UseEmojiAndSmiley()
             .UseGenericAttributes()
-            .Use<ImageUrlRewriterExtension>() // Custom extension for image processing
+            .Use(new ImageUrlRewriterExtension(_imageService)) // Custom extension for image processing
             .Build();
 
         // Configure YAML deserializer
diff --git a/Web/Services/IImageService.cs b/Web/Services/IImageService.cs
@@ -7,26 +7,12 @@ namespace Web.Services;
 /// </summary>
 public interface IImageService
 {
-    /// <summary>
-    /// Upload an image file to blob storage
-    /// </summary>
-    Task<ImageInfo> UploadImageAsync(Stream imageStream, string fileName, string? altText = null, string? caption = null);
 
     /// <summary>
     /// Get an image by its ID
     /// </summary>
     Task<ImageInfo?> GetImageAsync(string imageId);
 
-    /// <summary>
-    /// Delete an image from storage
-    /// </summary>
-    Task DeleteImageAsync(string imageId);
-
-    /// <summary>
-    /// Update image metadata (alt text, caption)
-    /// </summary>
-    Task UpdateImageMetadataAsync(string imageId, string? altText = null, string? caption = null);
-
     /// <summary>
     /// Get the public URL for an image
     /// </summary>
diff --git a/Web/Services/ImageService.cs b/Web/Services/ImageService.cs
@@ -28,68 +28,7 @@ public ImageService(
         _cdnEndpoint = configuration["Azure:CdnEndpoint"] ?? string.Empty;
     }
 
-    public async Task<ImageInfo> UploadImageAsync(Stream imageStream, string fileName, string? altText = null, string? caption = null)
-    {
-        try
-        {
-            // Create container if it doesn't exist
-            var container = _blobServiceClient.GetBlobContainerClient(_containerName);
-            await container.CreateIfNotExistsAsync(PublicAccessType.Blob);
-
-            // Generate a unique ID and path for the image
-            var imageId = Guid.NewGuid().ToString("N");
-            var blobPath = GenerateBlobPath(fileName, imageId);
-
-            // Calculate content hash
-            var contentHash = await CalculateContentHashAsync(imageStream);
-            imageStream.Position = 0;
-
-            // Get image dimensions and type
-            using var image = await Image.LoadAsync(imageStream);
-            imageStream.Position = 0;
-
-            var imageInfo = new ImageInfo
-            {
-                FileName = fileName,
-                ImageId = imageId,
-                BlobPath = blobPath,
-                PublicUrl = GetImageUrl(imageId),
-                AltText = altText ?? fileName,
-                Caption = caption,
-                Width = image.Width,
-                Height = image.Height,
-                ContentType = GetContentType(fileName),
-                UploadedAt = DateTime.UtcNow,
-                ContentHash = contentHash
-            };
-
-            // Upload original
-            var blobClient = container.GetBlobClient(blobPath);
-            await blobClient.UploadAsync(imageStream, new BlobUploadOptions
-            {
-                Metadata = new Dictionary<string, string>
-                {
-                    ["ImageId"] = imageId,
-                    ["FileName"] = fileName,
-                    ["AltText"] = altText ?? fileName,
-                    ["Caption"] = caption ?? string.Empty,
-                    ["ContentHash"] = contentHash
-                }
-            });
-
-            // Generate and upload thumbnails
-            await GenerateThumbnailsAsync(container, imageStream, blobPath);
-
-            return imageInfo;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error uploading image {FileName}", fileName);
-            throw;
-        }
-    }
-
-    public async Task<ImageInfo?> GetImageAsync(string imageId)
+    public async Task<Shared.ImageInfo?> GetImageAsync(string imageId)
     {
         try
         {
@@ -103,7 +42,7 @@ public async Task<ImageInfo> UploadImageAsync(Stream imageStream, string fileNam
                     var blobClient = container.GetBlobClient(blob.Name);
                     var properties = await blobClient.GetPropertiesAsync();
 
-                    return new ImageInfo
+                    return new Shared.ImageInfo
                     {
                         ImageId = imageId,
                         FileName = properties.Value.Metadata["FileName"],
@@ -127,52 +66,7 @@ public async Task<ImageInfo> UploadImageAsync(Stream imageStream, string fileNam
         }
     }
 
-    public async Task DeleteImageAsync(string imageId)
-    {
-        try
-        {
-            var container = _blobServiceClient.GetBlobContainerClient(_containerName);
-            var blobs = container.GetBlobsAsync(prefix: $"{imageId}/");
-
-            await foreach (var blob in blobs)
-            {
-                await container.DeleteBlobAsync(blob.Name);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error deleting image {ImageId}", imageId);
-            throw;
-        }
-    }
-
-    public async Task UpdateImageMetadataAsync(string imageId, string? altText = null, string? caption = null)
-    {
-        try
-        {
-            var container = _blobServiceClient.GetBlobContainerClient(_containerName);
-            var blobs = container.GetBlobsAsync(prefix: $"{imageId}/");
-
-            await foreach (var blob in blobs)
-            {
-                var blobClient = container.GetBlobClient(blob.Name);
-                var properties = await blobClient.GetPropertiesAsync();
-                var metadata = new Dictionary<string, string>(properties.Value.Metadata);
-
-                if (altText != null) metadata["AltText"] = altText;
-                if (caption != null) metadata["Caption"] = caption;
-
-                await blobClient.SetMetadataAsync(metadata);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error updating image metadata {ImageId}", imageId);
-            throw;
-        }
-    }
-
-    public string GetImageUrl(string imageId, ImageSize size = ImageSize.Original)
+     public string GetImageUrl(string imageId, ImageSize size = ImageSize.Original)
     {
         var sizeFolder = size switch
         {
@@ -190,64 +84,6 @@ public string GetImageUrl(string imageId, ImageSize size = ImageSize.Original)
         return $"{_blobServiceClient.Uri}{_containerName}/{imageId}/{sizeFolder}";
     }
 
-    private async Task GenerateThumbnailsAsync(BlobContainerClient container, Stream originalStream, string originalPath)
-    {
-        originalStream.Position = 0;
-        using var image = await Image.LoadAsync(originalStream);
-
-        // Define thumbnail sizes
-        var sizes = new Dictionary<string, (int width, int height)>
-        {
-            ["thumbnail"] = (150, 150),
-            ["medium"] = (400, 400),
-            ["large"] = (800, 800)
-        };
-
-        foreach (var size in sizes)
-        {
-            var resized = image.Clone(ctx => ctx.Resize(new ResizeOptions
-            {
-                Mode = ResizeMode.Max,
-                Size = new Size(size.Value.width, size.Value.height)
-            }));
-
-            var thumbnailPath = originalPath.Replace("/original", $"/{size.Key}");
-            var thumbnailBlob = container.GetBlobClient(thumbnailPath);
-
-            using var ms = new MemoryStream();
-            await resized.SaveAsync(ms, image.Metadata.DecodedImageFormat);
-            ms.Position = 0;
-
-            await thumbnailBlob.UploadAsync(ms, overwrite: true);
-        }
-    }
-
-    private string GenerateBlobPath(string fileName, string imageId)
-    {
-        var extension = Path.GetExtension(fileName);
-        return $"{imageId}/original{extension}";
-    }
-
-    private async Task<string> CalculateContentHashAsync(Stream stream)
-    {
-        using var sha256 = SHA256.Create();
-        var hash = await sha256.ComputeHashAsync(stream);
-        return Convert.ToBase64String(hash);
-    }
-
-    private string GetContentType(string fileName)
-    {
-        var extension = Path.GetExtension(fileName).ToLowerInvariant();
-        return extension switch
-        {
-            ".jpg" or ".jpeg" => "image/jpeg",
-            ".png" => "image/png",
-            ".gif" => "image/gif",
-            ".webp" => "image/webp",
-            _ => "application/octet-stream"
-        };
-    }
-
     public string? GetImageIdByFilename(string filename)
     {
         try
diff --git a/Web/Web.csproj b/Web/Web.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Azure.Data.Tables" Version="9.3.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.24.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.24.1" />
     <PackageReference Include="LigerShark.WebOptimizer.Core" Version="3.0.436" />
     <PackageReference Include="Markdig" Version="0.37.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.9" />

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ public static async Task<ImageInfo> ProcessAndUploadImageAsync(string imagePath,`
`19`	`19`	`await containerClient.CreateIfNotExistsAsync(PublicAccessType.Blob);`
`20`	`20`
`21`	`21`	`// Process image and get metadata`
`22`		`- using var image = await Image.LoadAsync(imagePath); var imageInfo = new ImageInfo`
	`22`	`+ using var image = await Image.LoadAsync(imagePath);`
	`23`	`+ var imageInfo = new ImageInfo`
`23`	`24`	`{`
`24`	`25`	`FileName = fileName,`
`25`	`26`	`ImageId = imageId,`