* Rename Umbraco.Core namespace to Umbraco.Cms.Core * Move extension methods in core project to Umbraco.Extensions * Move extension methods in core project to Umbraco.Extensions * Rename Umbraco.Examine namespace to Umbraco.Cms.Examine * Move examine extensions to Umbraco.Extensions namespace * Reflect changed namespaces in Builder and fix unit tests * Adjust namespace in Umbraco.ModelsBuilder.Embedded * Adjust namespace in Umbraco.Persistence.SqlCe * Adjust namespace in Umbraco.PublishedCache.NuCache * Align namespaces in Umbraco.Web.BackOffice * Align namespaces in Umbraco.Web.Common * Ensure that SqlCeSupport is still enabled after changing the namespace * Align namespaces in Umbraco.Web.Website * Align namespaces in Umbraco.Web.UI.NetCore * Align namespaces in Umbraco.Tests.Common * Align namespaces in Umbraco.Tests.UnitTests * Align namespaces in Umbraco.Tests.Integration * Fix errors caused by changed namespaces * Fix integration tests * Undo the Umbraco.Examine.Lucene namespace change This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows. * Fix merge * Fix Merge
73 lines
3.2 KiB
C#
73 lines
3.2 KiB
C#
using System.Collections.Generic;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using SixLabors.ImageSharp.Memory;
|
|
using SixLabors.ImageSharp.Web.Caching;
|
|
using SixLabors.ImageSharp.Web.Commands;
|
|
using SixLabors.ImageSharp.Web.DependencyInjection;
|
|
using SixLabors.ImageSharp.Web.Processors;
|
|
using SixLabors.ImageSharp.Web.Providers;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
|
|
namespace Umbraco.Extensions
|
|
{
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
/// <summary>
|
|
/// Adds Image Sharp with Umbraco settings
|
|
/// </summary>
|
|
public static IServiceCollection AddUmbracoImageSharp(this IServiceCollection services, IConfiguration configuration)
|
|
{
|
|
var imagingSettings = configuration.GetSection(Cms.Core.Constants.Configuration.ConfigImaging)
|
|
.Get<ImagingSettings>() ?? new ImagingSettings();
|
|
|
|
services.AddImageSharp(options =>
|
|
{
|
|
options.Configuration = SixLabors.ImageSharp.Configuration.Default;
|
|
options.BrowserMaxAge = imagingSettings.Cache.BrowserMaxAge;
|
|
options.CacheMaxAge = imagingSettings.Cache.CacheMaxAge;
|
|
options.CachedNameLength = imagingSettings.Cache.CachedNameLength;
|
|
options.OnParseCommandsAsync = context =>
|
|
{
|
|
RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Width, imagingSettings.Resize.MaxWidth);
|
|
RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Height, imagingSettings.Resize.MaxHeight);
|
|
|
|
return Task.CompletedTask;
|
|
};
|
|
options.OnBeforeSaveAsync = _ => Task.CompletedTask;
|
|
options.OnProcessedAsync = _ => Task.CompletedTask;
|
|
options.OnPrepareResponseAsync = _ => Task.CompletedTask;
|
|
})
|
|
.SetRequestParser<QueryCollectionRequestParser>()
|
|
.SetMemoryAllocator(provider => ArrayPoolMemoryAllocator.CreateWithMinimalPooling())
|
|
.Configure<PhysicalFileSystemCacheOptions>(options =>
|
|
{
|
|
options.CacheFolder = imagingSettings.Cache.CacheFolder;
|
|
})
|
|
.SetCache<PhysicalFileSystemCache>()
|
|
.SetCacheHash<CacheHash>()
|
|
.AddProvider<PhysicalFileSystemProvider>()
|
|
.AddProcessor<ResizeWebProcessor>()
|
|
.AddProcessor<FormatWebProcessor>()
|
|
.AddProcessor<BackgroundColorWebProcessor>();
|
|
|
|
return services;
|
|
}
|
|
|
|
private static void RemoveIntParamenterIfValueGreatherThen(IDictionary<string, string> commands, string parameter, int maxValue)
|
|
{
|
|
if (commands.TryGetValue(parameter, out var command))
|
|
{
|
|
if (int.TryParse(command, out var i))
|
|
{
|
|
if (i > maxValue)
|
|
{
|
|
commands.Remove(parameter);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|