From 95413bbdf4969e7afc943088cfa22ffee7d78036 Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Thu, 16 Jun 2022 20:03:04 -0500 Subject: [PATCH] (#508) ChocolateyNugetLogger update to nuget logger changes --- .../nuget/ChocolateyNugetLogger.cs | 138 ++++++++++++++++-- 1 file changed, 122 insertions(+), 16 deletions(-) diff --git a/src/chocolatey/infrastructure.app/nuget/ChocolateyNugetLogger.cs b/src/chocolatey/infrastructure.app/nuget/ChocolateyNugetLogger.cs index 80d923e880..2a2fe77191 100644 --- a/src/chocolatey/infrastructure.app/nuget/ChocolateyNugetLogger.cs +++ b/src/chocolatey/infrastructure.app/nuget/ChocolateyNugetLogger.cs @@ -25,36 +25,142 @@ namespace chocolatey.infrastructure.app.nuget public sealed class ChocolateyNugetLogger : ILogger { - public FileConflictResolution ResolveFileConflict(string message) + public void LogDebug(string message) { - this.Log().Debug("[NuGet] {0}{1} Resolving by automatic overwrite.".format_with(message.escape_curly_braces(),System.Environment.NewLine)); + this.Log().Debug("[NuGet] " + message); + } + + public void LogVerbose(string message) + { + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + message); + } + + public void LogWarning(string message) + { + this.Log().Warn("[NuGet] " + message); + } + + public void LogError(string message) + { + this.Log().Error("[NuGet] " + message); + } + + public void LogMinimal(string message) + { + this.Log().Info( "[NuGet] " + message); + } - return FileConflictResolution.OverwriteAll; + public void LogInformation(string message) + { + this.Log().Info("[NuGet] " + message); + } + + public void LogInformationSummary(string message) + { + this.Log().Info("[NuGet] " + message); + } + + public void Log(LogLevel level, string message) + { + switch (level) + { + case LogLevel.Debug: + this.Log().Debug("[NuGet] " + message); + break; + case LogLevel.Warning: + this.Log().Warn("[NuGet] " + message); + break; + case LogLevel.Error: + this.Log().Error("[NuGet] " + message); + break; + case LogLevel.Verbose: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + message); + break; + case LogLevel.Information: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + message); + break; + case LogLevel.Minimal: + this.Log().Info("[NuGet] " + message); + break; + } } - public void Log(MessageLevel level, string message, params object[] args) + public Task LogAsync(LogLevel level, string message) { switch (level) { - case MessageLevel.Debug: - this.Log().Debug("[NuGet] " + message, args); + case LogLevel.Debug: + this.Log().Debug("[NuGet] " + message); + break; + case LogLevel.Warning: + this.Log().Warn("[NuGet] " + message); + break; + case LogLevel.Error: + this.Log().Error("[NuGet] " + message); + break; + case LogLevel.Verbose: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + message); + break; + case LogLevel.Information: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + message); + break; + case LogLevel.Minimal: + this.Log().Info("[NuGet] " + message); + break; + } + + return Task.CompletedTask; + } + + public void Log(ILogMessage log) + { + switch (log.Level) + { + case LogLevel.Debug: + this.Log().Debug("[NuGet] " + log.Message); + break; + case LogLevel.Warning: + this.Log().Warn("[NuGet] " + log.Message); + break; + case LogLevel.Error: + this.Log().Error("[NuGet] " + log.Message); + break; + case LogLevel.Verbose: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + log.Message); + break; + case LogLevel.Information: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + log.Message); + break; + case LogLevel.Minimal: + this.Log().Info("[NuGet] " + log.Message); + break; + } + } + + public Task LogAsync(ILogMessage log) + { + switch (log.Level) + { + case LogLevel.Debug: + this.Log().Debug("[NuGet] " + log.Message); break; - case MessageLevel.Info: - this.Log().Info("[NuGet] " + message, args); + case LogLevel.Warning: + this.Log().Warn("[NuGet] " + log.Message); break; - case MessageLevel.Warning: - this.Log().Warn("[NuGet] " + message, args); + case LogLevel.Error: + this.Log().Error("[NuGet] " + log.Message); break; - case MessageLevel.Error: - this.Log().Error("[NuGet] " + message, args); + case LogLevel.Verbose: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + log.Message); break; - case MessageLevel.Fatal: - this.Log().Fatal("[NuGet] " + message, args); + case LogLevel.Information: + this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + log.Message); break; - case MessageLevel.Verbose: - this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + message, args); + case LogLevel.Minimal: + this.Log().Info("[NuGet] " + log.Message); break; } + return Task.CompletedTask; } }