RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LINQ-ify Import() logic and ignore case of file extensions.

This commit is contained in:
Lucas A 2020-12-23 12:56:04 +01:00
parent f1aefcdf86
commit 6a80e1303d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/OsuGameBase.cs
View File

@ -397,18 +397,13 @@ public async Task Import(params string[] paths)
public virtual async Task Import(params ImportTask[] tasks)
{
var importTasks = new List<Task>();
foreach (var extension in tasks.Select(t => Path.GetExtension(t.Path)).Distinct())
var extensions = tasks.Select(t => Path.GetExtension(t.Path).ToLowerInvariant()).Distinct();
await Task.WhenAll(extensions.Select(ext =>
{
var importList = tasks.Where(t => t.Path.EndsWith(extension, StringComparison.OrdinalIgnoreCase));
var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(extension));
var imports = tasks.Where(t => t.Path.EndsWith(ext, StringComparison.OrdinalIgnoreCase));
if (importer != null)
importTasks.Add(importer.Import(importList.ToArray()));
}
await Task.WhenAll(importTasks);
return fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext))?.Import(imports.ToArray()) ?? Task.CompletedTask;
}));
}
public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);