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

merge v10 to v11

Browse Source
This commit is contained in:
Bjarke Berg
2022-08-18 14:38:28 +02:00
parent c4aa718763 ac4fb6acf1
commit e9f9b8aee1
4076 changed files with 320268 additions and 303657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
src/Umbraco.Core/IO/ViewHelper.cs
View File

@@ -1,117 +1,120 @@
using System;
using System.IO;
using System.Linq;
using System.Text;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Web.Common.DependencyInjection;
using Umbraco.Extensions;
namespace Umbraco.Cms.Core.IO
namespace Umbraco.Cms.Core.IO;
public class ViewHelper : IViewHelper
{
public class ViewHelper : IViewHelper
{
private readonly IFileSystem _viewFileSystem;
private readonly IDefaultViewContentProvider _defaultViewContentProvider;
private readonly IDefaultViewContentProvider _defaultViewContentProvider;
private readonly IFileSystem _viewFileSystem;
public ViewHelper(FileSystems fileSystems, IDefaultViewContentProvider defaultViewContentProvider)
{
_viewFileSystem = fileSystems.MvcViewsFileSystem ?? throw new ArgumentNullException(nameof(fileSystems));
_defaultViewContentProvider = defaultViewContentProvider ?? throw new ArgumentNullException(nameof(defaultViewContentProvider));
}
}[Obsolete("Inject IDefaultViewContentProvider instead")]
public static string GetDefaultFileContent(string? layoutPageAlias = null, string? modelClassName = null, string? modelNamespace = null, string? modelNamespaceAlias = null)
{
IDefaultViewContentProvider viewContentProvider =
StaticServiceProvider.Instance.GetRequiredService<IDefaultViewContentProvider>();
return viewContentProvider.GetDefaultFileContent(layoutPageAlias, modelClassName, modelNamespace, modelNamespaceAlias);
}
public bool ViewExists(ITemplate t) => t.Alias is not null && _viewFileSystem.FileExists(ViewPath(t.Alias));
public bool ViewExists(ITemplate t) => t.Alias is not null && _viewFileSystem.FileExists(ViewPath(t.Alias));
public string GetFileContents(ITemplate t)
{
var viewContent = string.Empty;
var path = ViewPath(t.Alias ?? string.Empty);
public string GetFileContents(ITemplate t)
if (_viewFileSystem.FileExists(path))
{
var viewContent = "";
var path = ViewPath(t.Alias ?? string.Empty);
if (_viewFileSystem.FileExists(path))
using (var tr = new StreamReader(_viewFileSystem.OpenFile(path)))
{
using (var tr = new StreamReader(_viewFileSystem.OpenFile(path)))
{
viewContent = tr.ReadToEnd();
tr.Close();
}
viewContent = tr.ReadToEnd();
tr.Close();
}
return viewContent;
}
public string CreateView(ITemplate t, bool overWrite = false)
return viewContent;
}
public string CreateView(ITemplate t, bool overWrite = false)
{
string viewContent;
var path = ViewPath(t.Alias);
if (_viewFileSystem.FileExists(path) == false || overWrite)
{
string viewContent;
var path = ViewPath(t.Alias);
if (_viewFileSystem.FileExists(path) == false || overWrite)
{
viewContent = SaveTemplateToFile(t);
}
else
{
using (var tr = new StreamReader(_viewFileSystem.OpenFile(path)))
{
viewContent = tr.ReadToEnd();
tr.Close();
}
}
return viewContent;
viewContent = SaveTemplateToFile(t);
}
private string SaveTemplateToFile(ITemplate template)
else
{
var design = template.Content.IsNullOrWhiteSpace() ? EnsureInheritedLayout(template) : template.Content!;
var path = ViewPath(template.Alias);
var data = Encoding.UTF8.GetBytes(design);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
using (var tr = new StreamReader(_viewFileSystem.OpenFile(path)))
{
_viewFileSystem.AddFile(path, ms, true);
viewContent = tr.ReadToEnd();
tr.Close();
}
return design;
}
public string? UpdateViewFile(ITemplate t, string? currentAlias = null)
{
var path = ViewPath(t.Alias);
return viewContent;
}
if (string.IsNullOrEmpty(currentAlias) == false && currentAlias != t.Alias)
public string? UpdateViewFile(ITemplate t, string? currentAlias = null)
{
var path = ViewPath(t.Alias);
if (string.IsNullOrEmpty(currentAlias) == false && currentAlias != t.Alias)
{
// then kill the old file..
var oldFile = ViewPath(currentAlias);
if (_viewFileSystem.FileExists(oldFile))
{
//then kill the old file..
var oldFile = ViewPath(currentAlias);
if (_viewFileSystem.FileExists(oldFile))
_viewFileSystem.DeleteFile(oldFile);
_viewFileSystem.DeleteFile(oldFile);
}
var data = Encoding.UTF8.GetBytes(t.Content ?? string.Empty);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
{
_viewFileSystem.AddFile(path, ms, true);
}
return t.Content;
}
public string ViewPath(string alias)
var data = Encoding.UTF8.GetBytes(t.Content ?? string.Empty);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
{
return _viewFileSystem.GetRelativePath(alias.Replace(" ", "") + ".cshtml");
_viewFileSystem.AddFile(path, ms, true);
}
private string EnsureInheritedLayout(ITemplate template)
return t.Content;
}
public string ViewPath(string alias) => _viewFileSystem.GetRelativePath(alias.Replace(" ", string.Empty) + ".cshtml");
private string SaveTemplateToFile(ITemplate template)
{
var design = template.Content.IsNullOrWhiteSpace() ? EnsureInheritedLayout(template) : template.Content!;
var path = ViewPath(template.Alias);
var data = Encoding.UTF8.GetBytes(design);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
{
var design = template.Content;
if (string.IsNullOrEmpty(design))
design = _defaultViewContentProvider.GetDefaultFileContent(template.MasterTemplateAlias);
return design;
_viewFileSystem.AddFile(path, ms, true);
}
return design;
}
private string EnsureInheritedLayout(ITemplate template)
{
var design = template.Content;
if (string.IsNullOrEmpty(design))
{
design = _defaultViewContentProvider.GetDefaultFileContent(template.MasterTemplateAlias);
}
return design;
}
}