added to Microsoft.DotNet.Scaffolding.Internal.Services.IFileSystem (#…

…3107) Co-authored-by: Deep Choudhery <[email protected]>
dotnet · Dec 3, 2024 · 51866dd · 51866dd
1 parent 0ec70e8
commit 51866dd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 34 deletions.
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/FileSystem.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/FileSystem.cs
@@ -128,4 +128,12 @@ public async Task AddFileAsync(string outputPath, Stream sourceStream)
             await sourceStream.CopyToAsync(writeStream);
         }
     }
+
+    public void CreateDirectoryIfNotExists(string dirPath)
+    {
+        if (!DirectoryExists(dirPath))
+        {
+            CreateDirectory(dirPath);
+        }
+    }
 }
diff --git a/...-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/FirstTimeUseNoticeSentinel.cs b/...-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/FirstTimeUseNoticeSentinel.cs
@@ -34,11 +34,7 @@ public void CreateIfNotExists()
     {
         if (!Exists())
         {
-            if (!_fileSystem.DirectoryExists(_dotnetUserProfileFolderPath))
-            {
-                _fileSystem.CreateDirectory(_dotnetUserProfileFolderPath);
-            }
-
+            _fileSystem.CreateDirectoryIfNotExists(_dotnetUserProfileFolderPath);
             _fileSystem.WriteAllText(SentinelPath, string.Empty);
         }
     }

diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/IFileSystem.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/IFileSystem.cs
@@ -11,6 +11,8 @@ public interface IFileSystem
 {
     bool FileExists(string path);
 
+    void CreateDirectoryIfNotExists(string dirPath);
+
     bool DirectoryExists(string dirPath);
 
     void CreateDirectory(string dirPath);

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/AddFileStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/AddFileStep.cs
@@ -43,11 +43,7 @@ public override Task<bool> ExecuteAsync(ScaffolderContext context, CancellationT
         {
             _logger.LogInformation($"Adding file '{FileName}'...");
 
-            if (!_fileSystem.DirectoryExists(destinationDirectory))
-            {
-                _fileSystem.CreateDirectory(destinationDirectory);
-            }
-
+            _fileSystem.CreateDirectoryIfNotExists(destinationDirectory);
             _fileSystem.CopyFile(fileToCopy, destinationFilePath, overwrite: false);
             _logger.LogInformation("Done");
             return Task.FromResult(true);

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/AreaScaffolderStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/AreaScaffolderStep.cs
@@ -54,24 +54,15 @@ private void EnsureFolderLayout(AreaStepSettings stepSettings)
         }
 
         var areaBasePath = Path.Combine(basePath, "Areas");
-        if (!_fileSystem.DirectoryExists(areaBasePath))
-        {
-            _fileSystem.CreateDirectory(areaBasePath);
-        }
+        _fileSystem.CreateDirectoryIfNotExists(areaBasePath);
 
         var areaPath = Path.Combine(areaBasePath, stepSettings.Name);
-        if (!_fileSystem.DirectoryExists(areaPath))
-        {
-            _fileSystem.CreateDirectory(areaPath);
-        }
+        _fileSystem.CreateDirectoryIfNotExists(areaPath);
 
         foreach (var areaFolder in AreaFolders)
         {
             var path = Path.Combine(areaPath, areaFolder);
-            if (!_fileSystem.DirectoryExists(path))
-            {
-                _fileSystem.CreateDirectory(path);
-            }
+            _fileSystem.CreateDirectoryIfNotExists(path);
         }
 
         _logger.LogInformation("Done");

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/DotnetNewScaffolderStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/DotnetNewScaffolderStep.cs
@@ -61,10 +61,7 @@ private bool InvokeDotnetNew(DotnetNewStepSettings stepSettings)
             OutputFolders.TryGetValue(stepSettings.CommandName, out var folderName))
         {
             outputDirectory = Path.Combine(outputDirectory, folderName);
-            if (!_fileSystem.DirectoryExists(outputDirectory))
-            {
-                _fileSystem.CreateDirectory(outputDirectory);
-            }
+            _fileSystem.CreateDirectoryIfNotExists(outputDirectory);
         }
 
         var projectName = Path.GetFileNameWithoutExtension(stepSettings.Project);

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/EmptyControllerScaffolderStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/EmptyControllerScaffolderStep.cs
@@ -60,10 +60,7 @@ private bool InvokeDotnetNew(EmptyControllerStepSettings settings)
         if (!string.IsNullOrEmpty(outputDirectory))
         {
             outputDirectory = Path.Combine(outputDirectory, "Controllers");
-            if (!_fileSystem.DirectoryExists(outputDirectory))
-            {
-                _fileSystem.CreateDirectory(outputDirectory);
-            }
+            _fileSystem.CreateDirectoryIfNotExists(outputDirectory);
         }
         else
         {

diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Services/ToolManifestService.cs b/src/dotnet-scaffolding/dotnet-scaffold/Services/ToolManifestService.cs
@@ -27,10 +27,7 @@ public bool AddTool(string toolName)
 
     private void EnsureManifestDirectory()
     {
-        if (!_fileSystem.DirectoryExists(GetToolManifestDirectory()))
-        {
-            _fileSystem.CreateDirectory(GetToolManifestDirectory());
-        }
+        _fileSystem.CreateDirectoryIfNotExists(GetToolManifestDirectory());
     }
 
     public ScaffoldManifest GetManifest()