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

U4-7048 - more filesystems cleanup

Browse Source
This commit is contained in:
Stephan
2015-09-08 17:48:26 +02:00
parent e577648efd
commit 6b5057b870
19 changed files with 287 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
src/Umbraco.Web/WebServices/SaveFileController.cs
View File

@@ -38,56 +38,14 @@ namespace Umbraco.Web.WebServices
[HttpPost]
public JsonResult SavePartialViewMacro(string filename, string oldName, string contents)
{
//NOTE: This is a bit of a hack because we're sharing the View editor with templates/partial views/partial view macros, so the path starts with
// 'Partials' which we need to remove because the path that we construct the partial view with is a relative path to the root path of
// Views/Partials
if (filename.InvariantStartsWith("MacroPartials/"))
{
filename = filename.TrimStart("MacroPartials/");
}
if (oldName.IsNullOrWhiteSpace() == false)
{
if (oldName.InvariantStartsWith("MacroPartials/"))
{
oldName = oldName.TrimStart("MacroPartials/");
}
}
var svce = (FileService) Services.FileService;
var fileService = (FileService)Services.FileService;
//try to get the file by the old name first if they are different and delete that file
if (filename.Trim().InvariantEquals(oldName.Trim()) == false)
{
var existing = fileService.GetPartialViewMacro(oldName);
if (existing != null)
{
var success = fileService.DeletePartialViewMacro(existing.Path, Security.GetUserId());
if (success == false)
{
return Failed(
ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"),
//pass in a new exception ... this will also append the the message
new Exception("Could not delete old file: " + oldName));
}
}
}
var partialView = new PartialView(filename)
{
Content = contents
};
var attempt = fileService.SavePartialViewMacro(partialView);
if (attempt.Success == false)
{
return Failed(
ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"),
//pass in a new exception ... this will also append the the message
attempt.Exception);
}
return Success(ui.Text("speechBubbles", "partialViewSavedText"), ui.Text("speechBubbles", "partialViewSavedHeader"));
return SavePartialView(svce,
filename, oldName, contents,
"MacroPartials/",
(s, n) => s.GetPartialViewMacro(n),
(s, v) => s.ValidatePartialViewMacro((PartialView) v),
(s, v) => s.SavePartialViewMacro(v));
}
/// <summary>
@@ -100,53 +58,62 @@ namespace Umbraco.Web.WebServices
[HttpPost]
public JsonResult SavePartialView(string filename, string oldName, string contents)
{
//NOTE: This is a bit of a hack because we're sharing the View editor with templates/partial views/partial view macros, so the path starts with
// 'Partials' which we need to remove because the path that we construct the partial view with is a relative path to the root path of
// Views/Partials
if (filename.InvariantStartsWith("Partials/"))
{
filename = filename.TrimStart("Partials/");
}
if (oldName.IsNullOrWhiteSpace() == false)
{
if (oldName.InvariantStartsWith("Partials/"))
{
oldName = oldName.TrimStart("Partials/");
}
}
var svce = (FileService) Services.FileService;
var fileService = (FileService)Services.FileService;
//try to get the file by the old name first if they are different and delete that file
if (filename.Trim().InvariantEquals(oldName.Trim()) == false)
return SavePartialView(svce,
filename, oldName, contents,
"Partials/",
(s, n) => s.GetPartialView(n),
(s, v) => s.ValidatePartialView((PartialView) v),
(s, v) => s.SavePartialView(v));
}
private JsonResult SavePartialView(IFileService svce,
string filename, string oldname, string contents,
string pathPrefix,
Func<IFileService, string, IPartialView> get,
Func<IFileService, IPartialView, bool> validate,
Func<IFileService, IPartialView, Attempt<IPartialView>> save)
{
// sharing the editor with partial views & partial view macros,
// using path prefix to differenciate,
// but the file service manages different filesystems,
// and we need to come back to filesystem-relative paths
// not sure why we still need this but not going to change it now
if (filename.InvariantStartsWith(pathPrefix))
filename = filename.TrimStart(pathPrefix);
if (oldname != null && oldname.InvariantStartsWith(pathPrefix))
oldname = oldname.TrimStart(pathPrefix);
var view = get(svce, oldname);
if (view == null)
view = new PartialView(filename);
else
view.Path = filename;
view.Content = contents;
Attempt<IPartialView> attempt;
try
{
var existing = fileService.GetPartialView(oldName);
if (existing != null)
{
var success = fileService.DeletePartialView(existing.Path, Security.GetUserId());
if (success == false)
{
return Failed(
ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"),
//pass in a new exception ... this will also append the the message
new Exception("Could not delete old file: " + oldName));
}
}
var partialView = view as PartialView;
if (partialView != null && validate != null && validate(svce, partialView) == false)
return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"),
new FileSecurityException("File '" + view.Path + "' is not a valid partial view file."));
attempt = save(svce, view);
}
var partialView = new PartialView(filename)
catch (Exception e)
{
Content = contents
};
var attempt = fileService.SavePartialView(partialView);
return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), e);
}
if (attempt.Success == false)
{
return Failed(
ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"),
//pass in a new exception ... this will also append the the message
attempt.Exception);
return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"),
attempt.Exception);
}
return Success(ui.Text("speechBubbles", "partialViewSavedText"), ui.Text("speechBubbles", "partialViewSavedHeader"));