Merge pull request #167 from dotnet-campus/t/lindexi/TerminaLogger

尝试修复日志内容在 Terminal Logger 模式被忽略

Author: walterlv

DebUOS/Packaging.DebUOS.Tool/Program.cs

@@ -5,6 +5,7 @@
 using dotnetCampus.Cli;
 using dotnetCampus.Configurations.Core;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Console;
 using Packaging.DebUOS;
 using Packaging.DebUOS.Contexts.Configurations;
@@ -14,64 +15,106 @@
 
 var loggerFactory = LoggerFactory.Create(builder =>
 {
-    builder.AddSimpleConsole(simpleConsoleFormatterOptions =>
-    {
-        simpleConsoleFormatterOptions.ColorBehavior = LoggerColorBehavior.Disabled;
-        simpleConsoleFormatterOptions.SingleLine = true;
-    });
+    builder.AddConsole(loggerOptions => loggerOptions.FormatterName = MSBuildFormatter.FormatterName);
+    builder.AddConsoleFormatter<MSBuildFormatter, ConsoleFormatterOptions>();
 });
 
 var logger = loggerFactory.CreateLogger("");
 
-if (!string.IsNullOrEmpty(options.BuildPath))
-{
-    var packingFolder = new DirectoryInfo(options.BuildPath);
-    var outputPath = options.OutputPath ?? Path.Join(packingFolder.FullName, $"{packingFolder.Name}.deb");
-    var outputDebFile = new FileInfo(outputPath);
-
-    var debUosPackageCreator = new DebUOSPackageCreator(logger);
-    //var packingFolder = new DirectoryInfo(@"C:\lindexi\Work\");
-    //var outputDebFile = new FileInfo(@"C:\lindexi\Work\Downloader.deb");
-    debUosPackageCreator.PackageDeb(packingFolder, outputDebFile);
-}
-else if (!string.IsNullOrEmpty(options.PackageArgumentFilePath))
+try
 {
-    logger.LogInformation($"开始根据配置创建 UOS 的 deb 包。配置文件：{options.PackageArgumentFilePath}");
-    if (!File.Exists(options.PackageArgumentFilePath))
+    if (!string.IsNullOrEmpty(options.BuildPath))
     {
-        logger.LogError($"配置文件 '{options.PackageArgumentFilePath}' 不存在");
-        return;
+        var packingFolder = new DirectoryInfo(options.BuildPath);
+        var outputPath = options.OutputPath ?? Path.Join(packingFolder.FullName, $"{packingFolder.Name}.deb");
+        var outputDebFile = new FileInfo(outputPath);
+
+        var debUosPackageCreator = new DebUOSPackageCreator(logger);
+        //var packingFolder = new DirectoryInfo(@"C:\lindexi\Work\");
+        //var outputDebFile = new FileInfo(@"C:\lindexi\Work\Downloader.deb");
+        debUosPackageCreator.PackageDeb(packingFolder, outputDebFile);
     }
+    else if (!string.IsNullOrEmpty(options.PackageArgumentFilePath))
+    {
+        logger.LogInformation($"开始根据配置创建 UOS 的 deb 包。配置文件：{options.PackageArgumentFilePath}");
+        if (!File.Exists(options.PackageArgumentFilePath))
+        {
+            logger.LogError($"配置文件 '{options.PackageArgumentFilePath}' 不存在");
+            return;
+        }
+
+        var fileConfigurationRepo =
+            ConfigurationFactory.FromFile(options.PackageArgumentFilePath, RepoSyncingBehavior.Static);
+        var appConfigurator = fileConfigurationRepo.CreateAppConfigurator();
+        var configuration = appConfigurator.Of<DebUOSConfiguration>();
 
-    var fileConfigurationRepo = ConfigurationFactory.FromFile(options.PackageArgumentFilePath, RepoSyncingBehavior.Static);
-    var appConfigurator = fileConfigurationRepo.CreateAppConfigurator();
-    var configuration = appConfigurator.Of<DebUOSConfiguration>();
+        var fileStructCreator = new DebUOSPackageFileStructCreator(logger);
+        fileStructCreator.CreatePackagingFolder(configuration);
 
-    var fileStructCreator = new DebUOSPackageFileStructCreator(logger);
-    fileStructCreator.CreatePackagingFolder(configuration);
+        var packingFolder = new DirectoryInfo(configuration.PackingFolder!);
+        var outputDebFile = new FileInfo(configuration.DebUOSOutputFilePath!);
+        var workingFolder = new DirectoryInfo(configuration.WorkingFolder!);
+        var excludePackingDebFileExtensionsPredicate = configuration.ToExcludePackingDebFileExtensionsPredicate();
 
-    var packingFolder = new DirectoryInfo(configuration.PackingFolder!);
-    var outputDebFile = new FileInfo(configuration.DebUOSOutputFilePath!);
-    var workingFolder = new DirectoryInfo(configuration.WorkingFolder!);
-    var excludePackingDebFileExtensionsPredicate = configuration.ToExcludePackingDebFileExtensionsPredicate();
+        var debUosPackageCreator = new DebUOSPackageCreator(logger);
+        debUosPackageCreator.PackageDeb(packingFolder, outputDebFile, workingFolder,
+            optFileCanIncludePredicate: entry => /*取反，因为配置是不包括*/ !excludePackingDebFileExtensionsPredicate(entry));
+    }
+    else
+    {
+        // Show Help
+        var stringBuilder = new StringBuilder()
+            .AppendLine($"用法：[options] [arguments]");
+        foreach (var propertyInfo in typeof(Options).GetProperties())
+        {
+            var optionAttribute = propertyInfo.GetCustomAttribute<OptionAttribute>();
+            if (optionAttribute != null)
+            {
+                stringBuilder.AppendLine(
+                    $"-{optionAttribute.ShortName}  {(optionAttribute.LongName ?? string.Empty).PadRight(10)} {optionAttribute.Description} {optionAttribute.LocalizableDescription}");
+            }
+        }
 
-    var debUosPackageCreator = new DebUOSPackageCreator(logger);
-    debUosPackageCreator.PackageDeb(packingFolder, outputDebFile, workingFolder,
-        optFileCanIncludePredicate: entry => /*取反，因为配置是不包括*/  !excludePackingDebFileExtensionsPredicate(entry));
+        Console.WriteLine(stringBuilder.ToString());
+    }
+}
+catch (Exception e)
+{
+    logger.LogError(e, "Fail.");
 }
-else
+
+class MSBuildFormatter : ConsoleFormatter
 {
-    // Show Help
-    var stringBuilder = new StringBuilder()
-        .AppendLine($"用法：[options] [arguments]");
-    foreach (var propertyInfo in typeof(Options).GetProperties())
+    public MSBuildFormatter() : base(FormatterName)
     {
-        var optionAttribute = propertyInfo.GetCustomAttribute<OptionAttribute>();
-        if (optionAttribute != null)
+    }
+
+    public const string FormatterName = "MSBuild";
+
+    public override void Write<TState>(in LogEntry<TState> logEntry, IExternalScopeProvider? scopeProvider, TextWriter textWriter)
+    {
+        var logLevel = logEntry.LogLevel;
+        //var eventId = logEntry.EventId.Id;
+        var message = logEntry.Formatter(logEntry.State, logEntry.Exception);
+        var exception = logEntry.Exception;
+        var logLevelString = logLevel switch
+        {
+            LogLevel.Trace => "debug: ",
+            LogLevel.Debug => "debug: ",
+            LogLevel.Information => "info: ",
+            LogLevel.Warning => "warning: ",
+            LogLevel.Error => "error: ",
+            LogLevel.Critical => "error: ",
+            _ => "",
+        };
+        textWriter.Write($"{logLevelString}[DebUOS] {message}");
+        if (exception != null)
+        {
+            textWriter.WriteLine(exception);
+        }
+        else
         {
-            stringBuilder.AppendLine($"-{optionAttribute.ShortName}  {(optionAttribute.LongName ?? string.Empty).PadRight(10)} {optionAttribute.Description} {optionAttribute.LocalizableDescription}");
+            textWriter.WriteLine();
         }
     }
-
-    Console.WriteLine(stringBuilder.ToString());
-}
+}