Refactoring

usercode · usercode · commit c9a8ad63272e · 2023-11-13T19:23:01.000+01:00
diff --git a/src/ImageWizard.AWS/ImageWizard.AWS.csproj b/src/ImageWizard.AWS/ImageWizard.AWS.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.7.205.20" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.205.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageWizard.Azure/ImageWizard.Azure.csproj b/src/ImageWizard.Azure/ImageWizard.Azure.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />    
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.0" />    
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageWizard.Client/Builder/BuilderExtensions.cs b/src/ImageWizard.Client/Builder/BuilderExtensions.cs
@@ -2,7 +2,6 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using System;
 using System.Globalization;
 
 namespace ImageWizard.Client;
diff --git a/src/ImageWizard.Client/Builder/DeliveryTypeExtensions.cs b/src/ImageWizard.Client/Builder/DeliveryTypeExtensions.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
-using System;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -20,8 +19,6 @@ public static class DeliveryTypeExtensions
     /// <summary>
     /// Fetch file from absolute or relative url.
     /// </summary>
-    /// <param name="url"></param>
-    /// <returns></returns>
     public static IFilter Fetch(this ILoader imageUrlBuilder, string url)
     {
         return imageUrlBuilder.LoadData("fetch", url);
@@ -30,18 +27,8 @@ public static IFilter Fetch(this ILoader imageUrlBuilder, string url)
     /// <summary>
     /// Fetch file from wwwroot folder with fingerprint.
     /// </summary>
-    /// <param name="path"></param>
-    /// <returns></returns>
-    public static IFilter FetchLocalFile(this ILoader imageBuilder, string path, int? hashNameLength = null)
+    public static IFilter FetchLocalFile(this ILoader imageBuilder, string path, int maxVersionLength = 8)
     {
-        if (hashNameLength != null)
-        {
-            if (hashNameLength < 1 || hashNameLength > 43)
-            {
-                throw new ArgumentOutOfRangeException(nameof(hashNameLength));
-            }
-        }
-
         path = path.TrimStart('/');
 
         IWebHostEnvironment env = imageBuilder.ServiceProvider.GetRequiredService<IWebHostEnvironment>();
@@ -55,14 +42,7 @@ public static IFilter FetchLocalFile(this ILoader imageBuilder, string path, int
 
         string hashBase64 = WebEncoders.Base64UrlEncode(hashBufferSpan);
 
-        if (hashNameLength == null)
-        {
-            path += $"?v={hashBase64}";
-        }
-        else
-        {
-            path += $"?v={hashBase64.AsSpan(0, hashNameLength.Value)}";
-        }
+        path += $"?v={hashBase64.AsSpan(0, maxVersionLength)}";
 
         return imageBuilder.LoadData("fetch", path);
     }
diff --git a/src/ImageWizard.Client/Builder/GravatarExtensions.cs b/src/ImageWizard.Client/Builder/GravatarExtensions.cs
@@ -24,8 +24,8 @@ string GetHashString(byte[] hash)
 
             return sb.ToString();
         }
-
-        byte[] hashBuffer = MD5.Create().ComputeHash(Encoding.UTF8.GetBytes(email.Trim().ToLower()));
+        
+        byte[] hashBuffer = MD5.HashData(Encoding.UTF8.GetBytes(email.Trim().ToLower()));
 
         return new Image(imageUrlBuilder.LoadData("gravatar", GetHashString(hashBuffer)));
     }
diff --git a/src/ImageWizard.Client/Builder/ImageFilterExtensions.cs b/src/ImageWizard.Client/Builder/ImageFilterExtensions.cs
@@ -4,7 +4,6 @@
 
 using ImageWizard.Utils;
 using Microsoft.AspNetCore.WebUtilities;
-using System.Collections.Generic;
 using System.Text;
 
 namespace ImageWizard.Client;
diff --git a/src/ImageWizard.Client/Builder/Types/Abstracts/IUrlBuilder.cs b/src/ImageWizard.Client/Builder/Types/Abstracts/IUrlBuilder.cs
@@ -2,8 +2,6 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using System;
-
 namespace ImageWizard.Client;
 
 public interface IUrlBuilder
diff --git a/src/ImageWizard.Client/Builder/Types/File.cs b/src/ImageWizard.Client/Builder/Types/File.cs
@@ -2,8 +2,6 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using System;
-
 namespace ImageWizard.Client;
 
 public abstract class File : IFilter
diff --git a/src/ImageWizard.Client/Builder/UrlBuilder.cs b/src/ImageWizard.Client/Builder/UrlBuilder.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using Microsoft.Extensions.Options;
-using System;
 
 namespace ImageWizard.Client;
 
diff --git a/src/ImageWizard.Client/Builder/UrlBuilderContext.cs b/src/ImageWizard.Client/Builder/UrlBuilderContext.cs
@@ -5,8 +5,6 @@
 using ImageWizard.Utils;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
 
 namespace ImageWizard.Client;
 
@@ -18,13 +16,12 @@ class UrlBuilderContext : ILoader, IFilter, IBuildUrl
     public UrlBuilderContext(UrlBuilder imageUrlBuilder)
     {
         ImageUrlBuilder = imageUrlBuilder;
-        Filters = new List<string>();
     }
 
     public UrlBuilder ImageUrlBuilder { get; }
-    private List<string> Filters { get; }
-    private string LoaderSource { get; set; }
-    private string LoaderType { get; set; }
+    private List<string> Filters { get; } = new List<string>();
+    private string? LoaderSource { get; set; }
+    private string? LoaderType { get; set; }
 
     public ImageWizardClientSettings Settings => ImageUrlBuilder.Settings;
     public IServiceProvider ServiceProvider => ImageUrlBuilder.ServiceProvider;
@@ -46,10 +43,8 @@ public IFilter Filter(string filter)
 
     public string BuildUrl()
     {
-        if (string.IsNullOrEmpty(LoaderSource))
-        {
-            throw new Exception("No image is selected.");
-        }
+        ArgumentException.ThrowIfNullOrEmpty(LoaderType);
+        ArgumentException.ThrowIfNullOrEmpty(LoaderSource);
 
         if (ImageUrlBuilder.Settings.Enabled == false)
         {
diff --git a/src/ImageWizard.Client/Builder/YouTubeExtensions.cs b/src/ImageWizard.Client/Builder/YouTubeExtensions.cs
@@ -9,7 +9,7 @@ namespace ImageWizard.Client;
 /// </summary>
 public static class YouTubeExtensions
 {
-    public static Image Youtube(this ILoader imageUrlBuilder, string id)
+    public static Image YouTube(this ILoader imageUrlBuilder, string id)
     {
         return new Image(imageUrlBuilder.LoadData("youtube", id));
     }
diff --git a/src/ImageWizard.Client/Extensions.cs b/src/ImageWizard.Client/Extensions.cs
@@ -15,14 +15,12 @@ namespace ImageWizard.Client;
 /// </summary>
 public static class Extensions
 {
-    public static IServiceCollection AddImageWizardClient(this IServiceCollection services)
+    public static IServiceCollection AddImageWizardClient(this IServiceCollection services, Action<ImageWizardClientSettings>? options = null)
     {
-        return AddImageWizardClient(services, x => { });
-    }
-
-    public static IServiceCollection AddImageWizardClient(this IServiceCollection services, Action<ImageWizardClientSettings> setup)
-    {
-        services.Configure(setup);
+        if (options != null)
+        {
+            services.Configure(options);
+        }
 
         services.AddHttpContextAccessor();
         services.AddTransient<IImageWizardUrlBuilder, UrlBuilder>();
diff --git a/src/ImageWizard.Client/ImageWizardClientSettings.cs b/src/ImageWizard.Client/ImageWizardClientSettings.cs
@@ -8,20 +8,12 @@ namespace ImageWizard;
 
 public class ImageWizardClientSettings : ImageWizardBaseOptions
 {
-    public ImageWizardClientSettings()
-    {
-        UseUnsafeUrl = false;
-        Enabled = true;
-        BaseUrl = ImageWizardDefaults.BasePath;
-        Host = string.Empty;
-    }
+    public bool Enabled { get; set; } = true;
 
-    public bool Enabled { get; set; }
+    public bool UseUnsafeUrl { get; set; } = false;
 
-    public bool UseUnsafeUrl { get; set; }
+    public string BaseUrl { get; set; } = ImageWizardDefaults.BasePath;
 
-    public string BaseUrl { get; set; }
+    public string Host { get; set; } = string.Empty;
 
-    public string Host { get; set; }
-    
 }
diff --git a/src/ImageWizard.Client/TagHelpers/YoutubeTagHelper.cs b/src/ImageWizard.Client/TagHelpers/YoutubeTagHelper.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using System.IO;
 using System.Reflection;
 using System.Web;
 using System.Xml.Linq;
@@ -94,7 +93,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         output.Attributes.SetAttribute("data-embeded", HttpUtility.HtmlEncode(responsiveTag.ToString()));
 
         Image image = UrlBuilder
-                            .Youtube(VideoId)
+                            .YouTube(VideoId)
                             .Resize(Width, Height);
 
         if (Grayscale)
diff --git a/src/ImageWizard.Core/LINQ/LinqExtensions.cs b/src/ImageWizard.Core/LINQ/LinqExtensions.cs
@@ -4,7 +4,7 @@
 
 namespace ImageWizard;
 
-public static class LinqExtenions
+public static class LinqExtensions
 {
     public static void Foreach<T>(this IEnumerable<T> items, Action<T> action)
     {
diff --git a/src/ImageWizard.Core/Middlewares/ImageWizardApi.cs b/src/ImageWizard.Core/Middlewares/ImageWizardApi.cs
@@ -106,7 +106,7 @@ public static async Task ExecuteAsync(
         StringBuilder pathBuilder = new StringBuilder(url.Path);
 
         //get compatible mime types by the accept header
-        IEnumerable<string> acceptMimeTypes = context.Request.GetTypedHeaders().Accept
+        IEnumerable<string?> acceptMimeTypes = context.Request.GetTypedHeaders().Accept
                                                                     .Where(x => x.MatchesAllSubTypes == false)
                                                                     .Select(x => x.MediaType.Value)
                                                                     //filter unknown mime types
diff --git a/src/ImageWizard.Core/Middlewares/ImageWizardExtensions.cs b/src/ImageWizard.Core/Middlewares/ImageWizardExtensions.cs
@@ -23,7 +23,7 @@ public static class ImageWizardExtensions
     public static IEndpointConventionBuilder MapImageWizard(this IEndpointRouteBuilder endpoints, string path = ImageWizardDefaults.BasePath)
     {
         return endpoints
-                    .MapMethods($"{path}/{{signature}}/{{*path}}", new[] { HttpMethods.Get, HttpMethods.Head }, ImageWizardApi.ExecuteAsync)
+                    .MapMethods($"{path}/{{signature}}/{{*path}}", [HttpMethods.Get, HttpMethods.Head], ImageWizardApi.ExecuteAsync)
                     .WithDisplayName("ImageWizard");
     }
 
diff --git a/src/ImageWizard.Core/Pipelines/Builder/PipelineBuilder.cs b/src/ImageWizard.Core/Pipelines/Builder/PipelineBuilder.cs
@@ -14,13 +14,12 @@ public class PipelineBuilder : IPipelineBuilder
     public PipelineBuilder(IServiceCollection services)
     {
         Services = services;
-        MimeTypes = new List<string>();
     }
 
     /// <summary>
     /// MimeTypes
     /// </summary>
-    public IList<string> MimeTypes { get; private set; }
+    public IList<string> MimeTypes { get; private set; } = new List<string>();
 
     /// <summary>
     /// ServiceProvider
diff --git a/src/ImageWizard.ImageSharp/Filters/AutoOrientFilter.cs b/src/ImageWizard.ImageSharp/Filters/AutoOrientFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/BackgroundColorFilter.cs b/src/ImageWizard.ImageSharp/Filters/BackgroundColorFilter.cs
@@ -3,8 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/Base/ImageSharpFilterContext.cs b/src/ImageWizard.ImageSharp/Filters/Base/ImageSharpFilterContext.cs
@@ -5,8 +5,6 @@
 using ImageWizard.Processing;
 using ImageWizard.Processing.Results;
 using Microsoft.Extensions.Options;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/BlackWhiteFilter.cs b/src/ImageWizard.ImageSharp/Filters/BlackWhiteFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/BlurFilter.cs b/src/ImageWizard.ImageSharp/Filters/BlurFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/BrightnessFilter.cs b/src/ImageWizard.ImageSharp/Filters/BrightnessFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/ContrastFilter.cs b/src/ImageWizard.ImageSharp/Filters/ContrastFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/CropFilter.cs b/src/ImageWizard.ImageSharp/Filters/CropFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/FlipFilter.cs b/src/ImageWizard.ImageSharp/Filters/FlipFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/GrayscaleFilter.cs b/src/ImageWizard.ImageSharp/Filters/GrayscaleFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/InvertFilter.cs b/src/ImageWizard.ImageSharp/Filters/InvertFilter.cs
@@ -3,8 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/ResizeFilter.cs b/src/ImageWizard.ImageSharp/Filters/ResizeFilter.cs
@@ -3,8 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/RotateFilter.cs b/src/ImageWizard.ImageSharp/Filters/RotateFilter.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Attributes;
-using SixLabors.ImageSharp.Processing;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Filters/TextFilter.cs b/src/ImageWizard.ImageSharp/Filters/TextFilter.cs
@@ -2,8 +2,6 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.Drawing.Processing;
 using ImageWizard.Attributes;
diff --git a/src/ImageWizard.ImageSharp/Filters/WatermarkFilter.cs b/src/ImageWizard.ImageSharp/Filters/WatermarkFilter.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/Base/IImageFormat.cs b/src/ImageWizard.ImageSharp/ImageFormats/Base/IImageFormat.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/Base/ImageFormatHelper.cs b/src/ImageWizard.ImageSharp/ImageFormats/Base/ImageFormatHelper.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/BmpFormat.cs b/src/ImageWizard.ImageSharp/ImageFormats/BmpFormat.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/GifFormat.cs b/src/ImageWizard.ImageSharp/ImageFormats/GifFormat.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/JpegFormat.cs b/src/ImageWizard.ImageSharp/ImageFormats/JpegFormat.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/PngFormat.cs b/src/ImageWizard.ImageSharp/ImageFormats/PngFormat.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/TgaFormat.cs b/src/ImageWizard.ImageSharp/ImageFormats/TgaFormat.cs
diff --git a/src/ImageWizard.ImageSharp/ImageFormats/WebPFormat.cs b/src/ImageWizard.ImageSharp/ImageFormats/WebPFormat.cs
diff --git a/src/ImageWizard.ImageSharp/ImageSharpPipeline.cs b/src/ImageWizard.ImageSharp/ImageSharpPipeline.cs
diff --git a/src/ImageWizard.TestApp/Pages/Index.cshtml b/src/ImageWizard.TestApp/Pages/Index.cshtml
diff --git a/src/ImageWizard.Tests/ImageWizard.Tests.csproj b/src/ImageWizard.Tests/ImageWizard.Tests.csproj
diff --git a/src/ImageWizard.Utils/Signature/HMACSHA256UrlSignature.cs b/src/ImageWizard.Utils/Signature/HMACSHA256UrlSignature.cs

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ string GetHashString(byte[] hash)`
`24`	`24`
`25`	`25`	`return sb.ToString();`
`26`	`26`	`}`
`27`		`-`
`28`		`- byte[] hashBuffer = MD5.Create().ComputeHash(Encoding.UTF8.GetBytes(email.Trim().ToLower()));`
	`27`	`+`
	`28`	`+ byte[] hashBuffer = MD5.HashData(Encoding.UTF8.GetBytes(email.Trim().ToLower()));`
`29`	`29`
`30`	`30`	`return new Image(imageUrlBuilder.LoadData("gravatar", GetHashString(hashBuffer)));`
`31`	`31`	`}`