Merge pull request #27 from solidify-project/feature/cleanoutput

boyko-ant · web-flow · commit b744a730508e · 2018-07-19T15:12:50.000+03:00
Clean output folder before rendering new website
diff --git a/src/SolidifyProject.Engine.Infrastructure/Interfaces/IContentWriterService.cs b/src/SolidifyProject.Engine.Infrastructure/Interfaces/IContentWriterService.cs
@@ -5,5 +5,7 @@ namespace SolidifyProject.Engine.Infrastructure.Interfaces
     public interface IContentWriterService<T> where T : class
     {
         Task SaveContentAsync(string id, T content);
+
+        Task CleanFolderAsync(string path);
     }
 }
diff --git a/src/SolidifyProject.Engine.Infrastructure/Services/OrchestrationService.cs b/src/SolidifyProject.Engine.Infrastructure/Services/OrchestrationService.cs
@@ -29,6 +29,8 @@ public sealed class OrchestrationService
         
         public async Task RenderProjectAsync()
         {
+            await CleanOutputAsync();
+            
             var tasksGroupContent = Task.Run(async () =>
             {
                 var dataModel = await DataService.GetDataModelAsync();
@@ -87,5 +89,16 @@ private async Task CopyAssetByIdAsync(string id)
             
             await LoggerService.WriteLogMessage($"{DateTime.Now.ToLongTimeString()}: [Asset:Finished] \"{id}\"");
         }
+
+        private async Task CleanOutputAsync()
+        {
+            await LoggerService.WriteLogMessage($"{DateTime.Now.ToLongTimeString()}: Starting cleaning output folder");
+            
+            await PageModelWriterService.CleanFolderAsync(String.Empty);
+
+            await AssetsWriterService.CleanFolderAsync(String.Empty);
+
+            await LoggerService.WriteLogMessage($"{DateTime.Now.ToLongTimeString()}: Cleaning output folder finished");
+        }
     }
 }
diff --git a/src/SolidifyProject.Engine.Services/ContentWriterService/_FileSystemContentWriterServiceBase.cs b/src/SolidifyProject.Engine.Services/ContentWriterService/_FileSystemContentWriterServiceBase.cs
@@ -24,6 +24,25 @@ public void EnsureDirectoryExists(string path)
             Directory.CreateDirectory(directory);
         }
 
+        public Task CleanFolderAsync(string path)
+        {
+            DirectoryInfo di = new DirectoryInfo(Path.Combine(_root, path));
+            if (di.Exists)
+            {
+                foreach (var file in di.GetFiles())
+                {
+                    file.Delete();
+                }
+
+                foreach (var directory in di.GetDirectories())
+                {
+                    directory.Delete(true);
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
         public abstract Task SaveContentAsync(string id, T content);
     }
 }
diff --git a/src/Test/SolidifyProject.Engine.Test.Integration/Infrastructure/Services/OrchestrationServiceTest.cs b/src/Test/SolidifyProject.Engine.Test.Integration/Infrastructure/Services/OrchestrationServiceTest.cs
@@ -42,6 +42,13 @@ public class OrchestrationServiceTest
 
         private IHtmlMinificationService HtmlMinificationService => new GoogleHtmlMinificationService();
 
+        [TearDown]
+        public void TearDown()
+        {
+            _assetsWriterStorage.Clear();
+            _pageModelWriterStorage.Clear();
+        }
+
         [Test]
         public async Task ProduceHtml()
         {
@@ -76,5 +83,60 @@ public async Task ProduceHtml()
             
             Assert.AreEqual("<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title><link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/Assets/favicon.ico\"></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>", page.ContentRaw);
         }
+
+        [Test]
+        public async Task CleanUpBeforeRender()
+        {
+            Assert.AreEqual(0, _pageModelWriterStorage.Count);
+            Assert.AreEqual(0, _assetsWriterStorage.Count);
+            
+            _assetsWriterStorage.Add(new BinaryContentModel
+            {
+                Id = "fakedata"
+            });
+            
+            _assetsWriterStorage.Add(new BinaryContentModel
+            {
+                Id = "fakedata123"
+            });
+            
+            _pageModelWriterStorage.Add(new TextContentModel
+            {
+                Id = "fakedata"
+            });
+            
+            _pageModelWriterStorage.Add(new TextContentModel
+            {
+                Id = "fakedata123"
+            });
+            
+            var orchestrationService = new OrchestrationService();
+            orchestrationService.LoggerService = LoggerService;
+            orchestrationService.AssetsReaderService = AssetsReaderService;
+            orchestrationService.AssetsWriterService = AssetsWriterService;
+            orchestrationService.PageModelReaderService = PageModelReaderService;
+            orchestrationService.PageModelWriterService = PageModelWriterService;
+            orchestrationService.TemplateReaderService = TemplateReaderService;
+            orchestrationService.TemplateService = TemplateService;
+            orchestrationService.DataService = DataService;
+            orchestrationService.MarkupService = MarkupService;
+            orchestrationService.HtmlMinificationService = HtmlMinificationService;
+
+            await orchestrationService.RenderProjectAsync();
+
+            
+            Assert.AreEqual(2, _pageModelWriterStorage.Count);
+            Assert.IsFalse(_pageModelWriterStorage.All(x => x.ContentRaw == null));
+            
+            Assert.AreEqual(2, _assetsWriterStorage.Count);
+            Assert.IsFalse(_assetsWriterStorage.All(x => x.ContentRaw == null));
+
+            var logoAsset = _assetsWriterStorage.SingleOrDefault(x => x.Id.Contains("img") && x.Id.Contains("logo.png"));
+            Assert.IsNotNull(logoAsset);
+
+            var page = _pageModelWriterStorage.Single(x => x.Id.Equals("index.html"));
+            
+            Assert.AreEqual("<html><head><link href=\"/assets/style.css\" rel=\"stylesheet\" type=\"text/css\"><title>Static Site Generator - Home</title></head><body><div><ul><li><a href=\"https://facebook.com\">Facebook</a></li><li><a href=\"https://twitter.com\">Twitter</a></li></ul></div><h1>Welcome to Static Site Generator!</h1><h4>Authors</h4><h5>Founders</h5><ul><li>Anton Boyko (Microsoft Azure MVP)</li></ul><h5>Contributors</h5><p><strong>Powered by .NET Core 2.0</strong></p><div><i>All rights reserved</i></div></body></html>", page.ContentRaw);
+        }
     }
 }
diff --git a/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/ContentWriteServiceFakeTest.cs b/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/ContentWriteServiceFakeTest.cs
@@ -32,5 +32,11 @@ public override Task SaveContentAsyncTest(CustomDataModel newElement)
         {
             return base.SaveContentAsyncTest(newElement);
         }
+        
+        [TestCaseSource(nameof(_saveContentAsyncTestCases))]
+        public override Task CleanOutputAsyncTest(CustomDataModel newElement)
+        {
+            return base.CleanOutputAsyncTest(newElement);
+        }
     }
 }
diff --git a/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/FileSystemContentWriterServiceTest.cs b/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/FileSystemContentWriterServiceTest.cs
@@ -52,5 +52,11 @@ public override Task SaveContentAsyncTest(CustomDataModel newElement)
         {
             return base.SaveContentAsyncTest(newElement);
         }
+        
+        [TestCaseSource(nameof(_saveContentAsyncTestCases))]
+        public override Task CleanOutputAsyncTest(CustomDataModel newElement)
+        {
+            return base.CleanOutputAsyncTest(newElement);
+        }
     }
 }
diff --git a/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/_ContentWriterServiceTestBase.cs b/src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Services/ContentWriterService/_ContentWriterServiceTestBase.cs
@@ -26,5 +26,17 @@ public virtual async Task SaveContentAsyncTest(T newElement)
          
             Assert.IsTrue(AreEqual(newElement, newElementActual), "Objects are not equal");
         }
+
+        [Test]
+        public virtual async Task CleanOutputAsyncTest(T newElement)
+        {
+            await ContentWriterService.SaveContentAsync(newElement.Id, newElement);
+
+            await ContentWriterService.CleanFolderAsync("");
+
+            var newElementActual = await ContentReaderService.LoadContentByIdAsync(newElement.Id);
+            
+            Assert.IsNull(newElementActual);
+        }
     }
 }
diff --git a/src/Test/SolidifyProject.Engine.Test.Unit/_Fake/Infrastructure/Services/ContentWriterServiceFake.cs b/src/Test/SolidifyProject.Engine.Test.Unit/_Fake/Infrastructure/Services/ContentWriterServiceFake.cs
@@ -1,7 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Markdig.Extensions.TaskLists;
 using SolidifyProject.Engine.Infrastructure.Interfaces;
 using SolidifyProject.Engine.Infrastructure.Models.Base;
 
@@ -33,5 +35,23 @@ public Task SaveContentAsync(string id, T content)
 
             return Task.FromResult<object>(null);
         }
+
+        public Task CleanFolderAsync(string path)
+        {
+            if (!string.IsNullOrEmpty(path))
+            {
+                var elements = _storage
+                    .Where(x => x.Id.StartsWith($"{path}{Path.DirectorySeparatorChar}"));
+                
+                foreach (var element in elements)
+                {
+                    _storage.Remove(element);
+                }
+            }
+            
+            _storage.Clear();
+
+            return Task.CompletedTask;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ namespace SolidifyProject.Engine.Infrastructure.Interfaces`
`5`	`5`	`public interface IContentWriterService<T> where T : class`
`6`	`6`	`{`
`7`	`7`	`Task SaveContentAsync(string id, T content);`
	`8`	`+`
	`9`	`+ Task CleanFolderAsync(string path);`
`8`	`10`	`}`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public sealed class OrchestrationService`
`29`	`29`
`30`	`30`	`public async Task RenderProjectAsync()`
`31`	`31`	`{`
	`32`	`+ await CleanOutputAsync();`
	`33`	`+`
`32`	`34`	`var tasksGroupContent = Task.Run(async () =>`
`33`	`35`	`{`
`34`	`36`	`var dataModel = await DataService.GetDataModelAsync();`
`@@ -87,5 +89,16 @@ private async Task CopyAssetByIdAsync(string id)`
`87`	`89`
`88`	`90`	`await LoggerService.WriteLogMessage($"{DateTime.Now.ToLongTimeString()}: [Asset:Finished] \"{id}\"");`
`89`	`91`	`}`
	`92`	`+`
	`93`	`+ private async Task CleanOutputAsync()`
	`94`	`+ {`
	`95`	`+ await LoggerService.WriteLogMessage($"{DateTime.Now.ToLongTimeString()}: Starting cleaning output folder");`
	`96`	`+`
	`97`	`+ await PageModelWriterService.CleanFolderAsync(String.Empty);`
	`98`	`+`
	`99`	`+ await AssetsWriterService.CleanFolderAsync(String.Empty);`
	`100`	`+`
	`101`	`+ await LoggerService.WriteLogMessage($"{DateTime.Now.ToLongTimeString()}: Cleaning output folder finished");`
	`102`	`+ }`
`90`	`103`	`}`
`91`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,11 @@ public override Task SaveContentAsyncTest(CustomDataModel newElement)`
`32`	`32`	`{`
`33`	`33`	`return base.SaveContentAsyncTest(newElement);`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ [TestCaseSource(nameof(_saveContentAsyncTestCases))]`
	`37`	`+ public override Task CleanOutputAsyncTest(CustomDataModel newElement)`
	`38`	`+ {`
	`39`	`+ return base.CleanOutputAsyncTest(newElement);`
	`40`	`+ }`
`35`	`41`	`}`
`36`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,11 @@ public override Task SaveContentAsyncTest(CustomDataModel newElement)`
`52`	`52`	`{`
`53`	`53`	`return base.SaveContentAsyncTest(newElement);`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ [TestCaseSource(nameof(_saveContentAsyncTestCases))]`
	`57`	`+ public override Task CleanOutputAsyncTest(CustomDataModel newElement)`
	`58`	`+ {`
	`59`	`+ return base.CleanOutputAsyncTest(newElement);`
	`60`	`+ }`
`55`	`61`	`}`
`56`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,17 @@ public virtual async Task SaveContentAsyncTest(T newElement)`
`26`	`26`
`27`	`27`	`Assert.IsTrue(AreEqual(newElement, newElementActual), "Objects are not equal");`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ [Test]`
	`31`	`+ public virtual async Task CleanOutputAsyncTest(T newElement)`
	`32`	`+ {`
	`33`	`+ await ContentWriterService.SaveContentAsync(newElement.Id, newElement);`
	`34`	`+`
	`35`	`+ await ContentWriterService.CleanFolderAsync("");`
	`36`	`+`
	`37`	`+ var newElementActual = await ContentReaderService.LoadContentByIdAsync(newElement.Id);`
	`38`	`+`
	`39`	`+ Assert.IsNull(newElementActual);`
	`40`	`+ }`
`29`	`41`	`}`
`30`	`42`	`}`