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

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

Browse Source 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Kenn Jacobsen
2021-04-27 10:36:28 +02:00
committed by GitHub
parent 720e529474
commit 4f0d4d1fcd
6 changed files with 4 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ScriptRepository.cs
View File

@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Persistence.Repositories;
@@ -16,14 +12,9 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
/// </summary>
internal class ScriptRepository : FileRepository<string, IScript>, IScriptRepository
{
private readonly IIOHelper _ioHelper;
private readonly GlobalSettings _globalSettings;
public ScriptRepository(FileSystems fileSystems, IIOHelper ioHelper, IOptions<GlobalSettings> globalSettings)
public ScriptRepository(FileSystems fileSystems)
: base(fileSystems.ScriptsFileSystem)
{
_ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
_globalSettings = globalSettings.Value;
}
#region Implementation of IRepository<string,Script>
@@ -93,47 +84,6 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
}
}
public bool ValidateScript(IScript script)
{
// get full path
string fullPath;
try
{
// may throw for security reasons
fullPath = FileSystem.GetFullPath(script.Path);
}
catch
{
return false;
}
// validate path & extension
var validDir = _globalSettings.UmbracoScriptsPath;
var isValidPath = _ioHelper.VerifyEditPath(fullPath, validDir);
var validExts = new[] {"js"};
var isValidExtension = _ioHelper.VerifyFileExtension(script.Path, validExts);
return isValidPath && isValidExtension;
}
public Stream GetFileContentStream(string filepath)
{
if (FileSystem.FileExists(filepath) == false) return null;
try
{
return FileSystem.OpenFile(filepath);
}
catch
{
return null; // deal with race conds
}
}
public void SetFileContent(string filepath, Stream content)
{
FileSystem.AddFile(filepath, content, true);
}
#endregion
}
}