Fix PhysicalDirectoryArtifactImportOnStartupProvider example code

ronaldbarendse · ronaldbarendse · commit 038e0cae95bb · 2024-11-29T12:28:27.000+01:00
diff --git a/13/umbraco-deploy/deployment-workflow/import-on-startup.md b/13/umbraco-deploy/deployment-workflow/import-on-startup.md
@@ -29,7 +29,7 @@ internal sealed class DeployImportOnStartupComposer : IComposer
 {
     public void Compose(IUmbracoBuilder builder)
         => builder.DeployArtifactImportOnStartupProviders()
-        .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();
+            .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();
 
     private sealed class PhysicalDirectoryArtifactImportOnStartupProvider : IArtifactImportOnStartupProvider
     {
@@ -55,14 +55,14 @@ internal sealed class DeployImportOnStartupComposer : IComposer
 
             _logger.LogInformation("Imported Umbraco content and/or schema import at startup from directory {FilePath} with status: {OperationStatus}.", _artifactsPath, attempt.Result);
 
-            return attempt;
-        }
+            if (attempt.Success)
+            {
+                Directory.Delete(_artifactsPath, true);
 
-        public Task OnImportCompletedAsync()
-        {
-            Directory.Delete(_artifactsPath, true);
+                _logger.LogInformation("Deleted physical directory after successful import on startup {FilePath}.", _artifactsPath);
+            }
 
-            return Task.CompletedTask;
+            return attempt;
         }
     }
 }
diff --git a/14/umbraco-deploy/deployment-workflow/import-on-startup.md b/14/umbraco-deploy/deployment-workflow/import-on-startup.md
@@ -29,7 +29,7 @@ internal sealed class DeployImportOnStartupComposer : IComposer
 {
     public void Compose(IUmbracoBuilder builder)
         => builder.DeployArtifactImportOnStartupProviders()
-        .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();
+            .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();
 
     private sealed class PhysicalDirectoryArtifactImportOnStartupProvider : IArtifactImportOnStartupProvider
     {
@@ -55,14 +55,14 @@ internal sealed class DeployImportOnStartupComposer : IComposer
 
             _logger.LogInformation("Imported Umbraco content and/or schema import at startup from directory {FilePath} with status: {OperationStatus}.", _artifactsPath, attempt.Result);
 
-            return attempt;
-        }
+            if (attempt.Success)
+            {
+                Directory.Delete(_artifactsPath, true);
 
-        public Task OnImportCompletedAsync()
-        {
-            Directory.Delete(_artifactsPath, true);
+                _logger.LogInformation("Deleted physical directory after successful import on startup {FilePath}.", _artifactsPath);
+            }
 
-            return Task.CompletedTask;
+            return attempt;
         }
     }
 }
diff --git a/15/umbraco-deploy/deployment-workflow/import-on-startup.md b/15/umbraco-deploy/deployment-workflow/import-on-startup.md
@@ -29,7 +29,7 @@ internal sealed class DeployImportOnStartupComposer : IComposer
 {
     public void Compose(IUmbracoBuilder builder)
         => builder.DeployArtifactImportOnStartupProviders()
-        .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();
+            .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();
 
     private sealed class PhysicalDirectoryArtifactImportOnStartupProvider : IArtifactImportOnStartupProvider
     {
@@ -55,14 +55,14 @@ internal sealed class DeployImportOnStartupComposer : IComposer
 
             _logger.LogInformation("Imported Umbraco content and/or schema import at startup from directory {FilePath} with status: {OperationStatus}.", _artifactsPath, attempt.Result);
 
-            return attempt;
-        }
+            if (attempt.Success)
+            {
+                Directory.Delete(_artifactsPath, true);
 
-        public Task OnImportCompletedAsync()
-        {
-            Directory.Delete(_artifactsPath, true);
+                _logger.LogInformation("Deleted physical directory after successful import on startup {FilePath}.", _artifactsPath);
+            }
 
-            return Task.CompletedTask;
+            return attempt;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ internal sealed class DeployImportOnStartupComposer : IComposer`
`29`	`29`	`{`
`30`	`30`	`public void Compose(IUmbracoBuilder builder)`
`31`	`31`	`=> builder.DeployArtifactImportOnStartupProviders()`
`32`		`- .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();`
	`32`	`+ .Append<PhysicalDirectoryArtifactImportOnStartupProvider>();`
`33`	`33`
`34`	`34`	`private sealed class PhysicalDirectoryArtifactImportOnStartupProvider : IArtifactImportOnStartupProvider`
`35`	`35`	`{`
`@@ -55,14 +55,14 @@ internal sealed class DeployImportOnStartupComposer : IComposer`
`55`	`55`
`56`	`56`	`_logger.LogInformation("Imported Umbraco content and/or schema import at startup from directory {FilePath} with status: {OperationStatus}.", _artifactsPath, attempt.Result);`
`57`	`57`
`58`		`- return attempt;`
`59`		`- }`
	`58`	`+ if (attempt.Success)`
	`59`	`+ {`
	`60`	`+ Directory.Delete(_artifactsPath, true);`
`60`	`61`
`61`		`- public Task OnImportCompletedAsync()`
`62`		`- {`
`63`		`- Directory.Delete(_artifactsPath, true);`
	`62`	`+ _logger.LogInformation("Deleted physical directory after successful import on startup {FilePath}.", _artifactsPath);`
	`63`	`+ }`
`64`	`64`
`65`		`- return Task.CompletedTask;`
	`65`	`+ return attempt;`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`