cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 07:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Directory deletion not working

Browse Source
This commit is contained in:
Dominion
2023-04-02 12:50:07 -04:00
parent 4fc4bb0609
commit b4a32e1aaf
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/IO/DefaultIOManager.cs
+5 -11
View File
@@ -41,9 +41,10 @@ namespace Tgstation.Server.Host.IO
/// </summary>
/// <param name="dir"><see cref="DirectoryInfo"/> of the directory to empty.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="Task"/> representing the running operation.</returns>
static async Task NormalizeAndDelete(DirectoryInfo dir, CancellationToken cancellationToken)
static void NormalizeAndDelete(DirectoryInfo dir, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
// check if we are a symbolic link
if (!dir.Attributes.HasFlag(FileAttributes.Directory) || dir.Attributes.HasFlag(FileAttributes.ReparsePoint))
{
@@ -51,14 +52,8 @@ namespace Tgstation.Server.Host.IO
return;
}
await Task.Yield();
var tasks = new List<Task>();
foreach (var subDir in dir.EnumerateDirectories())
{
cancellationToken.ThrowIfCancellationRequested();
tasks.Add(NormalizeAndDelete(subDir, cancellationToken));
}
NormalizeAndDelete(subDir, cancellationToken);
foreach (var file in dir.EnumerateFiles())
{
@@ -67,7 +62,6 @@ namespace Tgstation.Server.Host.IO
file.Delete();
}
await Task.WhenAll(tasks);
cancellationToken.ThrowIfCancellationRequested();
dir.Delete(true);
}
@@ -158,7 +152,7 @@ namespace Tgstation.Server.Host.IO
return Task.Factory.StartNew(
() => NormalizeAndDelete(di, cancellationToken),
cancellationToken,
BlockingTaskCreationOptions,
TaskCreationOptions.LongRunning,
TaskScheduler.Current);
}