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

Fixing more errors with nullable reference types

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-02-24 09:24:56 +01:00
parent a8cf6ee127
commit ed13237177
186 changed files with 1737 additions and 1389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,8 +20,12 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
#region Implementation of IRepository<string,Script>
public override IScript Get(string id)
public override IScript? Get(string? id)
{
if (id is null || FileSystem is null)
{
return null;
}
// get the relative path within the filesystem
// (though... id should be relative already)
var path = FileSystem.GetRelativePath(id);
@@ -63,16 +67,20 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
script.GetFileContent = file => GetFileContent(file.OriginalPath);
}
public override IEnumerable<IScript> GetMany(params string[] ids)
public override IEnumerable<IScript> GetMany(params string[]? ids)
{
//ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
ids = ids.Distinct().ToArray();
ids = ids?.Distinct().ToArray();
if (ids.Any())
if (ids?.Any() ?? false)
{
foreach (var id in ids)
{
yield return Get(id);
IScript? script = Get(id);
if (script is not null)
{
yield return script;
}
}
}
else
@@ -80,7 +88,11 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
var files = FindAllFiles("", "*.*");
foreach (var file in files)
{
yield return Get(file);
IScript? script = Get(file);
if (script is not null)
{
yield return script;
}
}
}
}