yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed supported image file types from configuration and set up as a property on IImageUrlGenerator, so different providers can indicate support for different sets of images.

Browse Source
This commit is contained in:
Andy Butland
2020-09-22 15:06:03 +02:00
parent c2f343b17d
commit f42e8856db
17 changed files with 77 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
View File

@@ -1,10 +1,7 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.IO;
using Umbraco.Core.Media;
using Umbraco.Core.Models;
@@ -20,16 +17,13 @@ namespace Umbraco.Web.BackOffice.Controllers
public class ImagesController : UmbracoAuthorizedApiController
{
private readonly IMediaFileSystem _mediaFileSystem;
private readonly ContentSettings _contentSettings;
private readonly IImageUrlGenerator _imageUrlGenerator;
public ImagesController(
IMediaFileSystem mediaFileSystem,
IOptions<ContentSettings> contentSettings,
IImageUrlGenerator imageUrlGenerator)
{
_mediaFileSystem = mediaFileSystem;
_contentSettings = contentSettings.Value;
_imageUrlGenerator = imageUrlGenerator;
}
@@ -62,7 +56,7 @@ namespace Umbraco.Web.BackOffice.Controllers
var ext = Path.GetExtension(imagePath);
// we need to check if it is an image by extension
if (_contentSettings.IsImageFile(ext) == false)
if (_imageUrlGenerator.IsImageFile(ext) == false)
return NotFound();
//redirect to ImageProcessor thumbnail with rnd generated from last modified time of original media file