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

Merge pull request #8290 from umbraco/v8/bug/doctype-import

Browse Source 
Importing a doctype leaves behind temp files
This commit is contained in:
Bjarke Berg
2020-06-15 13:30:09 +02:00
committed by GitHub
parent 35751e257f 567d7176a5
commit 751a54f525
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Web/Editors/ContentTypeController.cs
View File

@@ -551,7 +551,6 @@ namespace Umbraco.Web.Editors
}
[HttpPost]
[FileUploadCleanupFilter(false)]
public async Task<ContentTypeImportModel> Upload()
{
if (Request.Content.IsMimeMultipartContent() == false)
@@ -577,20 +576,28 @@ namespace Umbraco.Web.Editors
var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
// renaming the file because MultipartFormDataStreamProvider has created a random fileName instead of using the name from the
// content-disposition for more than 6 years now. Creating a CustomMultipartDataStreamProvider deriving from MultipartFormDataStreamProvider
// seems like a cleaner option, but I'm not sure where to put it and renaming only takes one line of code.
System.IO.File.Move(result.FileData[0].LocalFileName, root + "\\" + fileName);
var destFileName = root + "\\" + fileName;
try
{
// due to a bug before 8.7.0 we didn't delete temp files, so we need to make sure to delete before
// moving else you get errors and the upload fails without a message in the UI (there's a JS error)
if(System.IO.File.Exists(destFileName))
System.IO.File.Delete(destFileName);
// renaming the file because MultipartFormDataStreamProvider has created a random fileName instead of using the name from the
// content-disposition for more than 6 years now. Creating a CustomMultipartDataStreamProvider deriving from MultipartFormDataStreamProvider
// seems like a cleaner option, but I'm not sure where to put it and renaming only takes one line of code.
System.IO.File.Move(result.FileData[0].LocalFileName, destFileName);
}
catch (Exception ex)
{
Logger.Error<ContentTypeController>(ex, "Error uploading udt file to App_Data: {File}", destFileName);
}
if (ext.InvariantEquals("udt"))
{
model.TempFileName = Path.Combine(root, fileName);
model.UploadedFiles.Add(new ContentPropertyFile
{
TempFilePath = model.TempFileName
});
var xd = new XmlDocument
{
XmlResolver = null

5
src/Umbraco.Web/Models/ContentTypeImportModel.cs
View File

@@ -1,12 +1,11 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
using Umbraco.Core.Models.Editors;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.Web.Models
{
[DataContract(Name = "contentTypeImportModel")]
public class ContentTypeImportModel : INotificationModel, IHaveUploadedFiles
public class ContentTypeImportModel : INotificationModel
{
[DataMember(Name = "alias")]
public string Alias { get; set; }
@@ -19,7 +18,5 @@ namespace Umbraco.Web.Models
[DataMember(Name = "tempFileName")]
public string TempFileName { get; set; }
public List<ContentPropertyFile> UploadedFiles => new List<ContentPropertyFile>();
}
}