Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

More complex directory deletion

Browse Source
This commit is contained in:
Timothy Baldridge 2021-12-19 14:52:06 -07:00
parent ac54d8d89d
commit a3e545281e
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Wabbajack.Paths.IO/AbsolutePathExtensions.cs
View File

@ -187,7 +187,24 @@ public static class AbsolutePathExtensions
{ {
if (!path.DirectoryExists()) return; if (!path.DirectoryExists()) return;
if (dontDeleteIfNotEmpty && (path.EnumerateFiles().Any() || path.EnumerateDirectories().Any())) return; if (dontDeleteIfNotEmpty && (path.EnumerateFiles().Any() || path.EnumerateDirectories().Any())) return;
Directory.Delete(ToNativePath(path), true);
foreach (string directory in Directory.GetDirectories(path.ToString()))
{
DeleteDirectory(directory.ToAbsolutePath(), dontDeleteIfNotEmpty);
}
try
{
Directory.Delete(path.ToString(), true);
}
catch (IOException)
{
Directory.Delete(path.ToString(), true);
}
catch (UnauthorizedAccessException)
{
Directory.Delete(path.ToString(), true);
}
} }
public static bool DirectoryExists(this AbsolutePath path) public static bool DirectoryExists(this AbsolutePath path)

2
Wabbajack.Server/DataModels/AuthorFiles.cs
View File

@ -91,8 +91,6 @@ public class AuthorFiles
public async Task DeleteFile(FileDefinition definition) public async Task DeleteFile(FileDefinition definition)
{ {
var folder = AuthorFilesLocation.Combine(definition.MungedName); var folder = AuthorFilesLocation.Combine(definition.MungedName);
foreach (var file in folder.EnumerateFiles())
file.Delete();
folder.DeleteDirectory(); folder.DeleteDirectory();
} }