diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 05ca39ea16..37dea64c21 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -144,28 +144,31 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
};
angular.module("umbraco")
.controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
- .run(function(mediaHelper, umbRequestHelper, assetsService){
+ .run(function(mediaHelper, umbRequestHelper){
if (mediaHelper && mediaHelper.registerFileResolver) {
- assetsService.load(["lib/moment/moment-with-locales.js"]).then(
- function () {
- //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
- // they contain different data structures so if we need to query against it we need to be aware of this.
- mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
- if (thumbnail) {
- if (mediaHelper.detectIfImageByExtension(property.value)) {
- //get default big thumbnail from image processor
- var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmm") + "&width=500";
- return thumbnailUrl;
- }
- else {
- return null;
- }
- }
- else {
- return property.value;
- }
- });
+
+ //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
+ // they contain different data structures so if we need to query against it we need to be aware of this.
+ mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
+ if (thumbnail) {
+
+ if (mediaHelper.detectIfImageByExtension(property.value)) {
+
+ var thumbnailUrl = umbRequestHelper.getApiUrl(
+ "imagesApiBaseUrl",
+ "GetBigThumbnail",
+ [{ originalImagePath: property.value }]);
+
+ return thumbnailUrl;
+ }
+ else {
+ return null;
+ }
+
}
- );
+ else {
+ return property.value;
+ }
+ });
}
- });
+ });
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index cbbbb30c36..39960317b1 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -1,120 +1,175 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Media;
-using Umbraco.Core.Models;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
-using Constants = Umbraco.Core.Constants;
-
-namespace Umbraco.Web.Editors
-{
- ///
- /// A controller used to return images for media
- ///
- [PluginController("UmbracoApi")]
- public class ImagesController : UmbracoAuthorizedApiController
- {
- ///
- /// Gets the big thumbnail image for the media id
- ///
- ///
- ///
- ///
- /// If there is no media, image property or image file is found then this will return not found.
- ///
- public HttpResponseMessage GetBigThumbnail(int mediaId)
- {
- var media = Services.MediaService.GetById(mediaId);
- if (media == null)
- {
- return Request.CreateResponse(HttpStatusCode.NotFound);
- }
-
- return GetResized(media, 500);
- }
-
- ///
- /// Gets the big thumbnail image for the original image path
- ///
- ///
- ///
- ///
- /// If there is no original image is found then this will return not found.
- ///
- public HttpResponseMessage GetBigThumbnail(string originalImagePath)
- {
- if (string.IsNullOrWhiteSpace(originalImagePath))
- return Request.CreateResponse(HttpStatusCode.OK);
-
- return GetResized(originalImagePath, 500);
- }
-
- ///
- /// Gets a resized image for the media id
- ///
- ///
- ///
- ///
- ///
- /// If there is no media, image property or image file is found then this will return not found.
- ///
- public HttpResponseMessage GetResized(int mediaId, int width)
- {
- var media = Services.MediaService.GetById(mediaId);
- if (media == null)
- {
- return new HttpResponseMessage(HttpStatusCode.NotFound);
- }
-
- return GetResized( media, 500 );
- }
-
- ///
- /// Gets a resized image for the image at the given path
- ///
- ///
- ///
- ///
- ///
- /// If there is no media, image property or image file is found then this will return not found.
- ///
- public HttpResponseMessage GetResized(string imagePath, int width)
- {
- var media = Services.MediaService.GetMediaByPath( imagePath );
- if (media == null)
- {
- return new HttpResponseMessage( HttpStatusCode.NotFound );
- }
-
- return GetResized( media, 500 );
- }
-
- ///
- /// Gets a resized image by redirecting to ImageProcessor
- ///
- ///
- ///
- ///
- private HttpResponseMessage GetResized(IMedia media, int width)
+using System;
+using System.Drawing;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Media;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Editors
+{
+ ///
+ /// A controller used to return images for media
+ ///
+ [PluginController("UmbracoApi")]
+ public class ImagesController : UmbracoAuthorizedApiController
+ {
+ ///
+ /// Gets the big thumbnail image for the media id
+ ///
+ ///
+ ///
+ ///
+ /// If there is no media, image property or image file is found then this will return not found.
+ ///
+ public HttpResponseMessage GetBigThumbnail(int mediaId)
{
- var imageProp = media.Properties[Constants.Conventions.Media.File];
- if (imageProp == null)
- {
- return Request.CreateResponse( HttpStatusCode.NotFound );
- }
-
- var imagePath = imageProp.Value.ToString();
- var response = Request.CreateResponse( HttpStatusCode.Found );
- response.Headers.Location = new Uri( string.Format( "{0}?rnd={1}&width={2}", imagePath, string.Format( "{0:yyyyMMddHHmm}", media.UpdateDate ), width ), UriKind.Relative );
- return response;
- }
- }
+ var media = Services.MediaService.GetById(mediaId);
+ if (media == null)
+ {
+ return Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+ var imageProp = media.Properties[Constants.Conventions.Media.File];
+ if (imageProp == null)
+ {
+ return Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+
+ var imagePath = imageProp.Value.ToString();
+
+ return GetBigThumbnail(imagePath);
+ }
+
+ ///
+ /// Gets the big thumbnail image for the original image path
+ ///
+ ///
+ ///
+ ///
+ /// If there is no original image is found then this will return not found.
+ ///
+ public HttpResponseMessage GetBigThumbnail(string originalImagePath)
+ {
+ if (string.IsNullOrWhiteSpace(originalImagePath))
+ return Request.CreateResponse(HttpStatusCode.OK);
+
+ return GetResized(originalImagePath, 500, "big-thumb");
+ }
+
+ ///
+ /// Gets a resized image for the media id
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// If there is no media, image property or image file is found then this will return not found.
+ ///
+ public HttpResponseMessage GetResized(int mediaId, int width)
+ {
+ var media = Services.MediaService.GetById(mediaId);
+ if (media == null)
+ {
+ return new HttpResponseMessage(HttpStatusCode.NotFound);
+ }
+ var imageProp = media.Properties[Constants.Conventions.Media.File];
+ if (imageProp == null)
+ {
+ return new HttpResponseMessage(HttpStatusCode.NotFound);
+ }
+
+ var imagePath = imageProp.Value.ToString();
+
+ return GetResized(imagePath, width);
+ }
+
+ ///
+ /// Gets a resized image for the image at the given path
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// If there is no media, image property or image file is found then this will return not found.
+ ///
+ public HttpResponseMessage GetResized(string imagePath, int width)
+ {
+ return GetResized(imagePath, width, Convert.ToString(width));
+ }
+
+ //TODO: We should delegate this to ImageProcessing
+
+ ///
+ /// Gets a resized image - if the requested max width is greater than the original image, only the original image will be returned.
+ ///
+ ///
+ ///
+ ///
+ ///
+ private HttpResponseMessage GetResized(string imagePath, int width, string suffix)
+ {
+ var mediaFileSystem = FileSystemProviderManager.Current.GetFileSystemProvider();
+ var ext = Path.GetExtension(imagePath);
+
+ //we need to check if it is an image by extension
+ if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.InvariantContains(ext.TrimStart('.')) == false)
+ {
+ return Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+
+ var thumbFilePath = imagePath.TrimEnd(ext) + "_" + suffix + ".jpg";
+ var fullOrgPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(imagePath));
+ var fullNewPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(thumbFilePath));
+ var thumbIsNew = mediaFileSystem.FileExists(fullNewPath) == false;
+ if (thumbIsNew)
+ {
+ //we need to generate it
+ if (mediaFileSystem.FileExists(fullOrgPath) == false)
+ {
+ return Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+
+ using (var fileStream = mediaFileSystem.OpenFile(fullOrgPath))
+ {
+ if (fileStream.CanSeek) fileStream.Seek(0, 0);
+ using (var originalImage = Image.FromStream(fileStream))
+ {
+ //If it is bigger, then do the resize
+ if (originalImage.Width >= width && originalImage.Height >= width)
+ {
+ ImageHelper.GenerateThumbnail(
+ originalImage,
+ width,
+ fullNewPath,
+ "jpg",
+ mediaFileSystem);
+ }
+ else
+ {
+ //just return the original image
+ fullNewPath = fullOrgPath;
+ }
+
+ }
+ }
+ }
+
+ var result = Request.CreateResponse(HttpStatusCode.OK);
+ //NOTE: That we are not closing this stream as the framework will do that for us, if we try it will
+ // fail. See http://stackoverflow.com/questions/9541351/returning-binary-file-from-controller-in-asp-net-web-api
+ var stream = mediaFileSystem.OpenFile(fullNewPath);
+ if (stream.CanSeek) stream.Seek(0, 0);
+ result.Content = new StreamContent(stream);
+ result.Headers.Date = mediaFileSystem.GetLastModified(imagePath);
+ result.Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+ return result;
+ }
+ }
}
\ No newline at end of file