Move the logic for finding temp images for persisting into a shared class so Grid & RTE can both use it

This commit is contained in:
Warren Buckley
2019-09-10 10:50:36 +01:00
parent d5331d85af
commit 6669b54a70
3 changed files with 119 additions and 66 deletions

View File

@@ -1,8 +1,11 @@
using System;
using HtmlAgilityPack;
using System;
using System.IO;
using System.Text.RegularExpressions;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Services;
using Umbraco.Web.Composing;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
@@ -183,5 +186,57 @@ namespace Umbraco.Web.Templates
internal static string RemoveMediaUrlsFromTextString(string text)
// see comment in ResolveMediaFromTextString for group reference
=> ResolveImgPattern.Replace(text, "$1$3$4$5");
internal static string FindAndPersistPastedTempImages(string html, int mediaParentFolder, int userId, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
{
// Find all img's that has data-tmpimg attribute
// Use HTML Agility Pack - https://html-agility-pack.net
var htmlDoc = new HtmlDocument();
htmlDoc.LoadHtml(html);
var tmpImages = htmlDoc.DocumentNode.SelectNodes("//img[@data-tmpimg]");
if (tmpImages == null || tmpImages.Count == 0)
return html;
foreach (var img in tmpImages)
{
// The data attribute contains the path to the tmp img to persist as a media item
var tmpImgPath = img.GetAttributeValue("data-tmpimg", string.Empty);
if (string.IsNullOrEmpty(tmpImgPath))
continue;
var absTmpImgPath = IOHelper.MapPath(tmpImgPath);
var fileName = Path.GetFileName(absTmpImgPath);
var safeFileName = fileName.ToSafeFileName();
var mediaItemName = safeFileName.ToFriendlyName();
var f = mediaService.CreateMedia(mediaItemName, mediaParentFolder, Constants.Conventions.MediaTypes.Image, userId);
var fileInfo = new FileInfo(absTmpImgPath);
var fs = fileInfo.OpenReadWithRetry();
if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
using (fs)
{
f.SetValue(contentTypeBaseServiceProvider, Constants.Conventions.Media.File, safeFileName, fs);
}
mediaService.Save(f, userId);
// Add the UDI to the img element as new data attribute
var udi = f.GetUdi();
img.SetAttributeValue("data-udi", udi.ToString());
//Get the new persisted image url
var mediaTyped = Current.UmbracoHelper.Media(f.Id);
var location = mediaTyped.Url;
img.SetAttributeValue("src", location);
// Remove the data attribute (so we do not re-process this)
img.Attributes.Remove("data-tmpimg");
}
return htmlDoc.DocumentNode.OuterHtml;
}
}
}