v11: Decouple dependencies (#12907)

* Move core dependencies and MSBuild targets from Umbraco.Cms to Umbraco.Cms.Targets * Re-add appsettings.Tests.json * Include appsettings-schema.json * Use .NET 7.x in CodeQL build * Fix duplicate Directory.Build.props import * Decouple ImageSharp/ImageSharp.Web implementations * Further decouple SqlServer implementation * Add SupportedImageFileTypes to IImageDimensionExtractor * Update descriptions * Update project metadata * Re-enable package validation * Add embedded package icon * Move ContinuousIntegrationBuild to build script * Move shared properties to root Directory.Build.props * Fix GetInstallState throwing exception when default provider isn't configured * Remove redundant PackageRequireLicenseAcceptance and update version to 11.0.0-rc1 * Update build script * Remove LangVersion preview * Disable app-local ICU for MacOS integration test * Disable app-local ICU for all integration tests * Fix RuntimeState_Run test assertion * Update projects and build script to require Node.js 16.17 (latest LTS) * Remove app-local ICU from unit tests * Add missing project reference * Generate XML documentation files * Expose management API in Web.UI project * Update .NET 7 dependencies to RC1 * Update package-lock.json files * Downgrade Cypress version
2022-09-27 14:22:34 +02:00
parent d206df0cac
commit 3873a0735c
90 changed files with 1061 additions and 1350 deletions
--- a/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs
+++ b/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs
@@ -0,0 +1,100 @@
+using System.Globalization;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Primitives;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Web.Processors;
+using Umbraco.Cms.Core.Media;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Imaging.ImageSharp.ImageProcessors;
+using static Umbraco.Cms.Core.Models.ImageUrlGenerationOptions;
+
+namespace Umbraco.Cms.Imaging.ImageSharp.Media;
+
+/// <summary>
+///     Exposes a method that generates an image URL based on the specified options that can be processed by ImageSharp.
+/// </summary>
+/// <seealso cref="IImageUrlGenerator" />
+public sealed class ImageSharpImageUrlGenerator : IImageUrlGenerator
+{
+    /// <inheritdoc />
+    public IEnumerable<string> SupportedImageFileTypes { get; }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="ImageSharpImageUrlGenerator" /> class.
+    /// </summary>
+    /// <param name="configuration">The ImageSharp configuration.</param>
+    public ImageSharpImageUrlGenerator(Configuration configuration)
+        : this(configuration.ImageFormats.SelectMany(f => f.FileExtensions).ToArray())
+    { }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="ImageSharpImageUrlGenerator" /> class.
+    /// </summary>
+    /// <param name="supportedImageFileTypes">The supported image file types/extensions.</param>
+    /// <remarks>
+    ///     This constructor is only used for testing.
+    /// </remarks>
+    internal ImageSharpImageUrlGenerator(IEnumerable<string> supportedImageFileTypes) =>
+        SupportedImageFileTypes = supportedImageFileTypes;
+
+    /// <inheritdoc />
+    public string? GetImageUrl(ImageUrlGenerationOptions? options)
+    {
+        if (options?.ImageUrl == null)
+        {
+            return null;
+        }
+
+        var queryString = new Dictionary<string, string?>();
+
+        if (options.Crop is not null)
+        {
+            CropCoordinates? crop = options.Crop;
+            queryString.Add(
+                CropWebProcessor.Coordinates,
+                FormattableString.Invariant($"{crop.Left},{crop.Top},{crop.Right},{crop.Bottom}"));
+        }
+
+        if (options.FocalPoint is not null)
+        {
+            queryString.Add(ResizeWebProcessor.Xy, FormattableString.Invariant($"{options.FocalPoint.Left},{options.FocalPoint.Top}"));
+        }
+
+        if (options.ImageCropMode is not null)
+        {
+            queryString.Add(ResizeWebProcessor.Mode, options.ImageCropMode.ToString()?.ToLowerInvariant());
+        }
+
+        if (options.ImageCropAnchor is not null)
+        {
+            queryString.Add(ResizeWebProcessor.Anchor, options.ImageCropAnchor.ToString()?.ToLowerInvariant());
+        }
+
+        if (options.Width is not null)
+        {
+            queryString.Add(ResizeWebProcessor.Width, options.Width?.ToString(CultureInfo.InvariantCulture));
+        }
+
+        if (options.Height is not null)
+        {
+            queryString.Add(ResizeWebProcessor.Height, options.Height?.ToString(CultureInfo.InvariantCulture));
+        }
+
+        if (options.Quality is not null)
+        {
+            queryString.Add(QualityWebProcessor.Quality, options.Quality?.ToString(CultureInfo.InvariantCulture));
+        }
+
+        foreach (KeyValuePair<string, StringValues> kvp in QueryHelpers.ParseQuery(options.FurtherOptions))
+        {
+            queryString.Add(kvp.Key, kvp.Value);
+        }
+
+        if (options.CacheBusterValue is not null && !string.IsNullOrWhiteSpace(options.CacheBusterValue))
+        {
+            queryString.Add("rnd", options.CacheBusterValue);
+        }
+
+        return QueryHelpers.AddQueryString(options.ImageUrl, queryString);
+    }
+}