Merge pull request #4002 from Ginger-Automation/Releases/Beta

Handled Screenshots folder not found issue
Ginger-Automation · Nov 18, 2024 · d8c96c4 · d8c96c4
2 parents a4cdca6 + c84b812
commit d8c96c4
Showing 1 changed file with 45 additions and 8 deletions.
diff --git a/Ginger/GingerCoreNET/Logger/WebReportGenerator.cs b/Ginger/GingerCoreNET/Logger/WebReportGenerator.cs
@@ -77,11 +77,6 @@ public LiteDbRunSet RunNewHtmlReport(string reportResultsFolderPath = "", string
                         IoHandler.Instance.TryFolderDelete(rootFolder);
                     }
                     IoHandler.Instance.CopyFolderRec(clientAppFolderPath, ReportrootPath, true);
-
-                    if(!Directory.Exists(Path.Combine(ReportrootPath, "assets", "screenshots")))
-                    {
-                        Directory.CreateDirectory(Path.Combine(ReportrootPath, "assets", "screenshots"));
-                    }
                 }
             }
             catch (Exception ex)
@@ -98,9 +93,9 @@ public LiteDbRunSet RunNewHtmlReport(string reportResultsFolderPath = "", string
                 {
                     return lightDbRunSet;
                 }
-                IoHandler.Instance.DeleteFoldersData(Path.Combine(ReportrootPath, "assets", "Execution_Data"));
-                IoHandler.Instance.DeleteFoldersData(Path.Combine(ReportrootPath, "assets", "screenshots"));
-                IoHandler.Instance.DeleteFoldersData(Path.Combine(ReportrootPath, "assets", "artifacts"));
+
+                CleanReportFolders(ReportrootPath);
+
                 LiteDbManager dbManager = new LiteDbManager(new ExecutionLoggerHelper().GetLoggerDirectory(WorkSpace.Instance.Solution.LoggerConfigurations.CalculatedLoggerFolder));
                 lightDbRunSet = dbManager.GetLatestExecutionRunsetData(runSetGuid);
                 lightDbRunSet.SetAllIterationElementsRecursively(WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<HTMLReportConfiguration>().First(r => r.IsDefault).ShowAllIterationsElements);
@@ -116,6 +111,48 @@ public LiteDbRunSet RunNewHtmlReport(string reportResultsFolderPath = "", string
             return lightDbRunSet;
         }
 
+        /// <summary>
+        /// Cleans the report folders by deleting data in specified subdirectories.
+        /// If the directories do not exist, they are created.
+        /// </summary>
+        /// <param name="ReportrootPath">The root path of the report folders.</param>
+        private static void CleanReportFolders(string ReportrootPath)
+        {
+            try
+            {
+                try
+                {
+                    IoHandler.Instance.DeleteFoldersData(Path.Combine(ReportrootPath, "assets", "Execution_Data"));
+                }
+                catch (DirectoryNotFoundException)
+                {
+                    Directory.CreateDirectory(Path.Combine(ReportrootPath, "assets", "Execution_Data"));
+                }
+
+                try
+                {
+                    IoHandler.Instance.DeleteFoldersData(Path.Combine(ReportrootPath, "assets", "screenshots"));
+                }
+                catch (DirectoryNotFoundException)
+                {
+                    Directory.CreateDirectory(Path.Combine(ReportrootPath, "assets", "screenshots"));
+                }
+
+                try
+                {
+                    IoHandler.Instance.DeleteFoldersData(Path.Combine(ReportrootPath, "assets", "artifacts"));
+                }
+                catch (DirectoryNotFoundException)
+                {
+                    Directory.CreateDirectory(Path.Combine(ReportrootPath, "assets", "artifacts"));
+                }
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Error while cleaning up reports folder", ex);
+            }
+        }
+
         private void RemoveSkippedItems(LiteDbRunSet liteDbRunSet)
         {
             HTMLReportConfiguration _HTMLReportConfig = WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<HTMLReportConfiguration>().FirstOrDefault(x => (x.IsDefault == true));