Ensure force is taken into account when itterating over all files

elastic · Nov 20, 2024 · 6055f4f · 6055f4f
1 parent ccb780f
commit 6055f4f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/Elastic.Markdown/DocumentationGenerator.cs b/src/Elastic.Markdown/DocumentationGenerator.cs
@@ -88,11 +88,15 @@ public async Task GenerateAll(Cancel ctx)
 
 		await Parallel.ForEachAsync(DocumentationSet.Files, ctx, async (file, token) =>
 		{
-			if (offendingFiles.Contains(file.SourceFile.FullName))
-				_logger.LogInformation($"Re-evaluating {file.SourceFile.FullName}");
-			else if (file.SourceFile.LastWriteTimeUtc <= outputSeenChanges)
-				return;
+			if (!Context.Force)
+			{
+				if (offendingFiles.Contains(file.SourceFile.FullName))
+					_logger.LogInformation($"Re-evaluating {file.SourceFile.FullName}");
+				else if (file.SourceFile.LastWriteTimeUtc <= outputSeenChanges)
+					return;
+			}
 
+			_logger.LogTrace($"{file.SourceFile.FullName}");
 			var item = Interlocked.Increment(ref handledItems);
 			var outputFile = OutputFile(file.RelativePath);
 			if (file is MarkdownFile markdown)

diff --git a/src/docs-builder/Program.cs b/src/docs-builder/Program.cs
@@ -5,7 +5,6 @@
 using Actions.Core.Extensions;
 using ConsoleAppFramework;
 using Documentation.Builder.Cli;
-using Documentation.Builder.Diagnostics;
 using Elastic.Markdown.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -23,7 +22,7 @@
 		c.SingleLine = true;
 		c.IncludeScopes = true;
 		c.UseUtcTimestamp = true;
-		c.TimestampFormat = "[yyyy-MM-ddTHH:mm:ss] ";
+		c.TimestampFormat = Environment.UserInteractive ? ":: " : "[yyyy-MM-ddTHH:mm:ss] ";
 	});
 });
 services.AddSingleton<DiagnosticsChannel>();