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

Remove a bunch of template related, unreferenced methods from file service and template repository (#9876)

Browse Source
This commit is contained in:
Kenn Jacobsen
2021-04-27 09:59:51 +02:00
committed by GitHub
parent c9ebaadf23
commit 720e529474
5 changed files with 2 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using Umbraco.Cms.Core.Models;
@@ -11,17 +11,8 @@ namespace Umbraco.Cms.Core.Persistence.Repositories
IEnumerable<ITemplate> GetAll(params string[] aliases);
IEnumerable<ITemplate> GetChildren(int masterTemplateId);
IEnumerable<ITemplate> GetChildren(string alias);
IEnumerable<ITemplate> GetDescendants(int masterTemplateId);
IEnumerable<ITemplate> GetDescendants(string alias);
/// <summary>
/// Validates a <see cref="ITemplate"/>
/// </summary>
/// <param name="template"><see cref="ITemplate"/> to validate</param>
/// <returns>True if Script is valid, otherwise false</returns>
bool ValidateTemplate(ITemplate template);
/// <summary>
/// Gets the content of a template as a stream.
@@ -29,14 +20,5 @@ namespace Umbraco.Cms.Core.Persistence.Repositories
/// <param name="filepath">The filesystem path to the template.</param>
/// <returns>The content of the template.</returns>
Stream GetFileContentStream(string filepath);
/// <summary>
/// Sets the content of a template.
/// </summary>
/// <param name="filepath">The filesystem path to the template.</param>
/// <param name="content">The content of the template.</param>
void SetFileContent(string filepath, Stream content);
long GetFileSize(string filepath);
}
}

51
src/Umbraco.Core/Services/IFileService.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using Umbraco.Cms.Core.Models;
@@ -154,13 +154,6 @@ namespace Umbraco.Cms.Core.Services
/// <returns>The <see cref="ITemplate"/> object matching the identifier, or null.</returns>
ITemplate GetTemplate(Guid id);
/// <summary>
/// Gets the template descendants
/// </summary>
/// <param name="alias"></param>
/// <returns></returns>
IEnumerable<ITemplate> GetTemplateDescendants(string alias);
/// <summary>
/// Gets the template descendants
/// </summary>
@@ -168,20 +161,6 @@ namespace Umbraco.Cms.Core.Services
/// <returns></returns>
IEnumerable<ITemplate> GetTemplateDescendants(int masterTemplateId);
/// <summary>
/// Gets the template children
/// </summary>
/// <param name="alias"></param>
/// <returns></returns>
IEnumerable<ITemplate> GetTemplateChildren(string alias);
/// <summary>
/// Gets the template children
/// </summary>
/// <param name="masterTemplateId"></param>
/// <returns></returns>
IEnumerable<ITemplate> GetTemplateChildren(int masterTemplateId);
/// <summary>
/// Saves a <see cref="ITemplate"/>
/// </summary>
@@ -209,13 +188,6 @@ namespace Umbraco.Cms.Core.Services
/// <param name="userId">Optional id of the user deleting the template</param>
void DeleteTemplate(string alias, int userId = Constants.Security.SuperUserId);
/// <summary>
/// Validates a <see cref="ITemplate"/>
/// </summary>
/// <param name="template"><see cref="ITemplate"/> to validate</param>
/// <returns>True if template is valid, otherwise false</returns>
bool ValidateTemplate(ITemplate template);
/// <summary>
/// Saves a collection of <see cref="Template"/> objects
/// </summary>
@@ -223,27 +195,6 @@ namespace Umbraco.Cms.Core.Services
/// <param name="userId">Optional id of the user</param>
void SaveTemplate(IEnumerable<ITemplate> templates, int userId = Constants.Security.SuperUserId);
/// <summary>
/// Gets the content of a template as a stream.
/// </summary>
/// <param name="filepath">The filesystem path to the template.</param>
/// <returns>The content of the template.</returns>
Stream GetTemplateFileContentStream(string filepath);
/// <summary>
/// Sets the content of a template.
/// </summary>
/// <param name="filepath">The filesystem path to the template.</param>
/// <param name="content">The content of the template.</param>
void SetTemplateFileContent(string filepath, Stream content);
/// <summary>
/// Gets the size of a template.
/// </summary>
/// <param name="filepath">The filesystem path to the template.</param>
/// <returns>The size of the template.</returns>
long GetTemplateFileSize(string filepath);
/// <summary>
/// Gets the content of a stylesheet as a stream.
/// </summary>

92
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs
View File

@@ -449,16 +449,6 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
}
}
public void SetFileContent(string filepath, Stream content)
{
GetFileSystem(filepath).AddFile(filepath, content, true);
}
public long GetFileSize(string filepath)
{
return GetFileSystem(filepath).GetSize(filepath);
}
private IFileSystem GetFileSystem(string filepath)
{
var ext = Path.GetExtension(filepath);
@@ -507,14 +497,6 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
return children;
}
public IEnumerable<ITemplate> GetChildren(string alias)
{
//return from base.GetAll, this is all cached
return base.GetMany().Where(x => alias.IsNullOrWhiteSpace()
? x.MasterTemplateAlias.IsNullOrWhiteSpace()
: x.MasterTemplateAlias.InvariantEquals(alias));
}
public IEnumerable<ITemplate> GetDescendants(int masterTemplateId)
{
//return from base.GetAll, this is all cached
@@ -541,30 +523,6 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
return descendants;
}
public IEnumerable<ITemplate> GetDescendants(string alias)
{
var all = base.GetMany().ToArray();
var descendants = new List<ITemplate>();
if (alias.IsNullOrWhiteSpace() == false)
{
var parent = all.FirstOrDefault(x => x.Alias.InvariantEquals(alias));
if (parent == null) return Enumerable.Empty<ITemplate>();
//recursively add all children
AddChildren(all, descendants, parent.Alias);
}
else
{
descendants.AddRange(all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace()));
foreach (var parent in descendants)
{
//recursively add all children with a level
AddChildren(all, descendants, parent.Alias);
}
}
//return the list - it will be naturally ordered by level
return descendants;
}
private void AddChildren(ITemplate[] all, List<ITemplate> descendants, string masterAlias)
{
var c = all.Where(x => x.MasterTemplateAlias.InvariantEquals(masterAlias)).ToArray();
@@ -577,56 +535,6 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
}
}
/// <summary>
/// Validates a <see cref="ITemplate"/>
/// </summary>
/// <param name="template"><see cref="ITemplate"/> to validate</param>
/// <returns>True if Script is valid, otherwise false</returns>
public bool ValidateTemplate(ITemplate template)
{
// get path
// TODO: templates should have a real Path somehow - but anyways
// are we using Path for something else?!
var path = template.VirtualPath;
// get valid paths
var validDirs = new[] { Cms.Core.Constants.SystemDirectories.MvcViews };
// get valid extensions
var validExts = new List<string>();
validExts.Add("cshtml");
validExts.Add("vbhtml");
// validate path and extension
var validFile = _ioHelper.VerifyEditPath(path, validDirs);
var validExtension = _ioHelper.VerifyFileExtension(path, validExts);
return validFile && validExtension;
}
private static IEnumerable<TemplateNode> CreateChildren(TemplateNode parent, IEnumerable<ITemplate> childTemplates, ITemplate[] allTemplates)
{
var children = new List<TemplateNode>();
foreach (var childTemplate in childTemplates)
{
var template = allTemplates.Single(x => x.Id == childTemplate.Id);
var child = new TemplateNode(template)
{
Parent = parent
};
//add to our list
children.Add(child);
//get this node's children
var local = childTemplate;
var kids = allTemplates.Where(x => x.MasterTemplateAlias.InvariantEquals(local.Alias));
//recurse
child.Children = CreateChildren(child, kids, allTemplates);
}
return children;
}
#endregion
/// <summary>

72
src/Umbraco.Infrastructure/Services/Implement/FileService.cs
View File

@@ -460,14 +460,6 @@ namespace Umbraco.Cms.Core.Services.Implement
}
}
public IEnumerable<ITemplate> GetTemplateDescendants(string alias)
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
return _templateRepository.GetDescendants(alias);
}
}
/// <summary>
/// Gets the template descendants
/// </summary>
@@ -481,32 +473,6 @@ namespace Umbraco.Cms.Core.Services.Implement
}
}
/// <summary>
/// Gets the template children
/// </summary>
/// <param name="alias"></param>
/// <returns></returns>
public IEnumerable<ITemplate> GetTemplateChildren(string alias)
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
return _templateRepository.GetChildren(alias);
}
}
/// <summary>
/// Gets the template children
/// </summary>
/// <param name="masterTemplateId"></param>
/// <returns></returns>
public IEnumerable<ITemplate> GetTemplateChildren(int masterTemplateId)
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
return _templateRepository.GetChildren(masterTemplateId);
}
}
/// <summary>
/// Saves a <see cref="Template"/>
/// </summary>
@@ -607,44 +573,6 @@ namespace Umbraco.Cms.Core.Services.Implement
}
}
/// <summary>
/// Validates a <see cref="ITemplate"/>
/// </summary>
/// <param name="template"><see cref="ITemplate"/> to validate</param>
/// <returns>True if Script is valid, otherwise false</returns>
public bool ValidateTemplate(ITemplate template)
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
return _templateRepository.ValidateTemplate(template);
}
}
public Stream GetTemplateFileContentStream(string filepath)
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
return _templateRepository.GetFileContentStream(filepath);
}
}
public void SetTemplateFileContent(string filepath, Stream content)
{
using (var scope = ScopeProvider.CreateScope())
{
_templateRepository.SetFileContent(filepath, content);
scope.Complete();
}
}
public long GetTemplateFileSize(string filepath)
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
return _templateRepository.GetFileSize(filepath);
}
}
private string GetViewContent(string fileName)
{
if (fileName.IsNullOrWhiteSpace())

7
src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
View File

@@ -374,13 +374,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repos
// Act
IEnumerable<ITemplate> childrenById = repository.GetChildren(created[1].Id);
IEnumerable<ITemplate> childrenByAlias = repository.GetChildren(created[1].Alias);
// Assert
Assert.AreEqual(2, childrenById.Count());
Assert.AreEqual(2, childrenById.DistinctBy(x => x.Id).Count());
Assert.AreEqual(2, childrenByAlias.Count());
Assert.AreEqual(2, childrenByAlias.DistinctBy(x => x.Id).Count());
}
}
@@ -418,14 +415,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repos
// Act
IEnumerable<ITemplate> descendantsById = repository.GetDescendants(created[1].Id);
IEnumerable<ITemplate> descendantsByAlias = repository.GetDescendants(created[1].Alias);
// Assert
Assert.AreEqual(3, descendantsById.Count());
Assert.AreEqual(3, descendantsById.DistinctBy(x => x.Id).Count());
Assert.AreEqual(3, descendantsByAlias.Count());
Assert.AreEqual(3, descendantsByAlias.DistinctBy(x => x.Id).Count());
}
}