test1

Author: dovisutu

projects/1.20-fabric/assets/minecraft/minecraft/packer-policy.json

@@ -1,6 +1,6 @@
 [
     {
         "type": "indirect",
-        "source": "./projects/1.20/assets/minecraft/minecraft"
+        "source": "projects/1.20/assets/minecraft/minecraft"
     }
 ]

src/Packer/Extensions/ContentExtension.cs

@@ -1,4 +1,5 @@
-using System;
+using Serilog;
+using System;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -81,6 +82,22 @@ public static bool IsPathForceExcluded(this string location, Config config)
         public static bool IsPathForceIncluded(this string location, Config config)
             => config.Floating.InclusionPaths.Contains(location);
 
+        /// <summary>
+        /// 将字符串输出到调试日志，然后返回该字符串
+        /// </summary>
+        public static string LogToDebug(this string message, string template)
+        {
+            Log.Debug(template, message);
+            return message;
+        }
+        /// <summary>
+        /// 将字符串输出到调试日志，然后返回该字符串
+        /// </summary>
+        public static string LogToDebug(this string message)
+        {
+            Log.Debug(message);
+            return message;
+        }
 
         // 临时方法
         /// <summary>

src/Packer/Extensions/DirectoryExtension.cs

@@ -1,6 +1,7 @@
 using Packer.Helpers;
 using Packer.Models;
 using Packer.Models.Providers;
+using Serilog;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -98,6 +99,8 @@ internal static EvaluatorReturnType FromSpecifiedDirectory(DirectoryInfo namespa
             var namespaceName = namespaceDirectory.Name;
             var redirectDirectory = new DirectoryInfo(redirect!);
 
+            Log.Debug("[Policy:Indirect]目标：{0}，源：{1}", namespaceName, redirect);
+
             return from candidate in redirectDirectory.EnumerateRawProviders(config)
                    let provider = candidate.provider
                                            .ReplaceDestination(@"(?<=^assets/)[^/]*(?=/)",
@@ -112,6 +115,9 @@ internal static EvaluatorReturnType FromComposition(DirectoryInfo namespaceDirec
             var compositionPath = parameters!["source"].GetString();
             var type = parameters["destType"].GetString();
             var compositionFile = new FileInfo(compositionPath!);
+
+            Log.Debug("[Policy:Composition]目标：{0}，源：{1}", namespaceDirectory.Name, compositionPath);
+
             IResourceFileProvider provider = type switch // 类型推断不出要用接口
             {
                 "lang" => LangMappingHelper.CreateFromComposition(compositionFile),
@@ -129,8 +135,12 @@ internal static EvaluatorReturnType FromSingleton(DirectoryInfo namespaceDirecto
             var relativePath = parameters!["relativePath"].GetString()!;
             var destination = Path.Combine("assets", namespaceDirectory.Name, relativePath)
                                   .NormalizePath();
+
+            Log.Debug("[Policy:Singleton]目标：{0}，源：{1}", destination, singletonPath);
+
             var file = new FileInfo(singletonPath!);
             var provider = CreateProviderFromFile(file, destination, config);
+
             yield return (provider, GetOptions(parameters));
         }
 

src/Packer/Helpers/ConfigHelpers.cs

@@ -1,4 +1,5 @@
-using Packer.Models;
+using Packer.Extensions;
+using Packer.Models;
 using Serilog;
 using System.Collections.Generic;
 using System.IO;
@@ -26,9 +27,11 @@ public static class ConfigHelpers
 
             if (configFile is null) return null;
 
+            configFile.FullName.LogToDebug("读取文件：{0}");
+            
             using var reader = configFile.OpenText();
             return JsonSerializer.Deserialize<FloatingConfig>(
-                reader.ReadToEnd(),
+                reader.ReadToEnd().LogToDebug(),
                 new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
         }
 
@@ -55,7 +58,7 @@ public static async Task<Config> RetrieveConfig(string configTemplate, string ve
         /// 从给定的命名空间获取策略内容
         /// </summary>
         /// <param name="directory">命名空间目录</param>
-        /// <returns>若文件存在，返回对应的内容；否则，返回<c>Direct</c></returns>
+        /// <returns>若文件存在，返回对应的内容；否则，返回<c>[Direct]</c></returns>
         /// <exception cref="InvalidDataException">策略文件非法</exception>
         public static List<PackerPolicy> RetrievePolicy(DirectoryInfo directory)
         {
@@ -67,9 +70,11 @@ public static List<PackerPolicy> RetrievePolicy(DirectoryInfo directory)
                     new PackerPolicy { Type = PackerPolicyType.Direct }
                 };
 
+            file.FullName.LogToDebug("读取文件：{0}");
+
             using var reader = file.OpenText();
             var result = JsonSerializer.Deserialize<List<PackerPolicy>>(
-                reader.ReadToEnd(),
+                reader.ReadToEnd().LogToDebug(),
                 new JsonSerializerOptions
                 {
                     PropertyNamingPolicy = JsonNamingPolicy.CamelCase,

src/Packer/Program.cs

@@ -16,12 +16,18 @@ class Program
         // System.CommandLine.DragonFruit支持
         public static async Task Main(string version, bool increment = false)
         {
+            var levelSwitch = new Serilog.Core.LoggingLevelSwitch();
+
             Log.Logger = new LoggerConfiguration()
              .Enrich.FromLogContext()
              .WriteTo.Console()
-             .MinimumLevel.Information() // 以便 debug 时修改这一等级
+             .MinimumLevel.ControlledBy(levelSwitch) // 以便 debug 时修改这一等级
              .CreateLogger();
 
+            // 若开启了debug logging，显示更多日志（包括IEnumerable里的东西）
+            if (Environment.GetEnvironmentVariable("ACTIONS_STEP_DEBUG") == "true")
+                levelSwitch.MinimumLevel = Serilog.Events.LogEventLevel.Debug;
+
             var config = await ConfigHelpers.RetrieveConfig(configTemplate: "./config/packer/{0}.json",
                                                     version: version);
             Log.Information("开始对版本 {0} 的打包", config.Base.Version);
@@ -66,19 +72,21 @@ select config.Floating.DestinationReplacement                       // 全局路
                                     ? McMetaProvider.Create(file, file.Name) // 类型推断不出要用接口
                                     : new RawFile(file, file.Name) as IResourceFileProvider;
 
+            var totalQuery = query.Concat(initialsQuery);
+
             string packName = $"./Minecraft-Mod-Language-Package-{config.Base.Version}.zip";
             await using var stream = File.Create(packName);
 
             using (var archive = new ZipArchive(stream, ZipArchiveMode.Update, leaveOpen: true))
             {
-                await Task.WhenAll(from provider in query.Concat(initialsQuery)
+                await Task.WhenAll(from provider in totalQuery
                                    select provider.WriteToArchive(archive));
             }
 
-            Log.Information("对版本 {0} 的打包结束。共写入了 {1} + {2} 个文件",
-                            config.Base.Version,
-                            initialsQuery.Count(),
-                            query.Count());
+            Log.Information("对版本 {0} 的打包结束。", version);
+            if (totalQuery.TryGetNonEnumeratedCount(out var count))
+                Log.Information("文件总数：{0}", count);
+
             var md5 = stream.ComputeMD5();
 
             Log.Information("打包文件的 MD5 值：{0}", md5);