回退 src/Packer/ 到 main 分支版本

和 Packer.Core 无关的测试改动全部丢弃，
避免合并冲突和 PR 审查干扰。

Author: zms9110750

src/Packer/Extensions/ContentExtension.cs

@@ -107,7 +107,7 @@ public static string LogToDebug(this string message)
         /// <returns></returns>
         public static string ComputeMD5(this Stream stream)
         {
-            stream.Position = 0; // 确保文件流的位置被重置
+            stream.Seek(0, SeekOrigin.Begin); // 确保文件流的位置被重置
             return Convert.ToHexString(MD5.Create().ComputeHash(stream));
         }
     }

src/Packer/Helpers/ConfigHelpers.cs

@@ -25,13 +25,13 @@ public static class ConfigHelpers
         {
             var configFile = directory.GetFiles("local-config.json").FirstOrDefault();
 
-            if (configFile is null)
-                return null;
+            if (configFile is null) return null;
 
             configFile.FullName.LogToDebug("读取文件：{0}");
-
+            
+            using var reader = configFile.OpenText();
             return JsonSerializer.Deserialize<FloatingConfig>(
-                configFile.ReadAllText().LogToDebug(),
+                reader.ReadToEnd().LogToDebug(),
                 new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
         }
 
@@ -48,11 +48,10 @@ public static async Task<Config> RetrieveConfig(string configTemplate, string ve
 
             Log.Information("配置位置：{0}", configPath);
 
-            await using var content = File.OpenRead(configPath);
-
-            return (await JsonSerializer.DeserializeAsync<Config>(
+            var content = await File.ReadAllBytesAsync(configPath);
+            return JsonSerializer.Deserialize<Config>(
                 content,
-                new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }))!;
+                new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })!;
         }
 
         /// <summary>
@@ -73,8 +72,9 @@ public static List<PackerPolicy> RetrievePolicy(DirectoryInfo directory)
 
             file.FullName.LogToDebug("读取文件：{0}");
 
+            using var reader = file.OpenText();
             var result = JsonSerializer.Deserialize<List<PackerPolicy>>(
-                file.ReadAllText().LogToDebug(),
+                reader.ReadToEnd().LogToDebug(),
                 new JsonSerializerOptions
                 {
                     PropertyNamingPolicy = JsonNamingPolicy.CamelCase,

src/Packer/Models/Config.cs

@@ -121,9 +121,9 @@ public class FloatingConfig
             InclusionDomains = InclusionDomains.Concat(other.InclusionDomains).Distinct(),
             InclusionPaths = InclusionPaths.Concat(other.InclusionPaths).Distinct(),
             CharacterReplacement = CharacterReplacement.Concat(other.CharacterReplacement).DistinctBy(_ => _.Key)
-                                                       .ToDictionary(),
+                                                       .ToDictionary(_ => _.Key, _ => _.Value),
             DestinationReplacement = DestinationReplacement.Concat(other.DestinationReplacement).DistinctBy(_ => _.Key)
-                                                           .ToDictionary()
+                                                           .ToDictionary(_ => _.Key, _ => _.Value)
         };
 
 

src/Packer/Models/IResourceFileProvider.cs

@@ -47,7 +47,7 @@ public IResourceFileProvider ReplaceContent(string searchPattern, string replace
         /// </summary>
         /// <param name="archive"></param>
         /// <exception cref="InvalidOperationException">资源包中已有同名文件</exception>
-        public Task WriteToArchiveAsync(ZipArchive archive);
+        public Task WriteToArchive(ZipArchive archive);
 
         /// <summary>
         /// 目标在资源包中的相对位置，从根目录算起

src/Packer/Models/Providers/CompositionHelper.cs

@@ -1,5 +1,4 @@
-using Packer.Extensions;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -17,9 +16,10 @@ public static partial class LangMappingHelper
         /// </summary>
         /// <param name="file">组合文件</param>
         public static LangMappingProvider CreateFromComposition(FileInfo file)
-        { 
+        {
+            using var reader = file.OpenText();
             var data = JsonSerializer.Deserialize<CompositionData>(
-                file.ReadAllText(),
+                reader.ReadToEnd(),
                 new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
             return new LangMappingProvider(
                 new LangDictionaryWrapper(CompositionHelper.CreateRawDictionary(data)),
@@ -34,9 +34,10 @@ public static partial class JsonMappingHelper
         /// </summary>
         /// <param name="file">组合文件</param>
         public static JsonMappingProvider CreateFromComposition(FileInfo file)
-        { 
+        {
+            using var reader = file.OpenText();
             var data = JsonSerializer.Deserialize<CompositionData>(
-                file.ReadAllText(),
+                reader.ReadToEnd(),
                 new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
             return new JsonMappingProvider(
                 JsonDictionaryWrapper.Create(CompositionHelper.CreateRawDictionary(data)),
@@ -66,7 +67,7 @@ internal static IEnumerable<KeyValuePair<IEnumerable<TOuter>, IEnumerable<TInner
                 seed: new[] { KeyValuePair.Create(Enumerable.Empty<TOuter>(), Enumerable.Empty<TInner>()) }
                     as IEnumerable<KeyValuePair<IEnumerable<TOuter>, IEnumerable<TInner>>>, // 这都需要手写...
                 (accumulate, next) => from incomingPair in next
-                                      from existingGroup in accumulate
+                                      join existingGroup in accumulate on true equals true
                                       select KeyValuePair.Create(
                                           existingGroup.Key.Append(incomingPair.Key),
                                           existingGroup.Value.Append(incomingPair.Value)));

src/Packer/Models/Providers/McMetaProvider.cs

@@ -37,7 +37,7 @@ public override IResourceFileProvider ReplaceContent(string searchPattern, strin
         public override IResourceFileProvider ReplaceDestination(string searchPattern, string replacement)
             => this;
         /// <inheritdoc/>
-        public override async Task WriteToArchiveAsync(ZipArchive archive)
+        public override async Task WriteToArchive(ZipArchive archive)
         {
             var destination = Destination.NormalizePath();
             Log.Debug("[McMetaProvider]写入路径 {0}", destination);

src/Packer/Models/Providers/RawFile.cs

@@ -44,7 +44,7 @@ public IResourceFileProvider ReplaceDestination(string searchPattern, string rep
                                          RegexOptions.Singleline));
 
         /// <inheritdoc/>
-        public async Task WriteToArchiveAsync(ZipArchive archive)
+        public async Task WriteToArchive(ZipArchive archive)
         {
             var destination = Destination.NormalizePath();
             Log.Debug("[RawFile]写入路径 {0}", destination);

src/Packer/Models/Providers/TermMappingProvider.cs

@@ -84,13 +84,14 @@ public ITermDictionary<JsonNode> ReplaceContent(string searchPattern, string rep
             var result = new Dictionary<string, JsonNode>();
             foreach (var (key, value) in this)
             {
-                if (value.GetValueKind() == JsonValueKind.String)
+                if (value is JsonValue jsonValue
+                    && jsonValue.TryGetValue<string>(out var stringValue))
                 {
-                    var replaced = Regex.Replace(value.GetValue<string>(),
+                    var replaced = Regex.Replace(stringValue,
                                                  searchPattern,
                                                  replacement,
                                                  RegexOptions.Singleline);
-                    result.Add(key, JsonValue.Create(replaced)); // 我猜不会null罢
+                    result.Add(key, JsonValue.Create(replaced)!); // 我猜不会null罢
                     continue;
                 }
                 result.Add(key, value);
@@ -100,8 +101,12 @@ public ITermDictionary<JsonNode> ReplaceContent(string searchPattern, string rep
 
         public static ITermDictionary<JsonNode> Create(IDictionary<string, string> nominalMapping)
         {
-            var transformed = nominalMapping
-                .ToDictionary(p => p.Key, p => JsonValue.Create(p.Value) as JsonNode);
+            var query = from pair in nominalMapping
+                        let key = pair.Key
+                        let value = pair.Value
+                        let node = JsonValue.Create(value)!
+                        select (key, node);
+            var transformed = query.ToDictionary(_ => _.key, _ => _.node as JsonNode);
             return new JsonDictionaryWrapper(transformed);
         }
     }
@@ -140,8 +145,7 @@ public TermMappingProvider(ITermDictionary<TValue> map, string destination)
         /// <inheritdoc/>
         public IResourceFileProvider ApplyTo(IResourceFileProvider? baseProvider, ApplyOptions options)
         {
-            if (baseProvider is null)
-                return this;
+            if (baseProvider is null) return this;
 
             if (baseProvider is not TermMappingProvider<TValue> baseMapping)
                 throw new ArgumentException($"Argument not an instance of {typeof(TermMappingProvider<TValue>)}.",
@@ -186,7 +190,7 @@ public IResourceFileProvider ReplaceDestination(string searchPattern, string rep
                               RegexOptions.Singleline));
 
         /// <inheritdoc/>
-        public async Task WriteToArchiveAsync(ZipArchive archive)
+        public async Task WriteToArchive(ZipArchive archive)
         {
             var destination = Destination.NormalizePath();
             Log.Debug("[TermMappingProvider`1]写入路径 {0}", destination);
@@ -283,8 +287,7 @@ internal static Dictionary<string, string> DeserializeFromLang(string content)
                 var splitPosition = line.IndexOf('=');
 
                 // https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/pull/3272/files#r1461545452
-                if (splitPosition == -1)
-                    continue;
+                if (splitPosition == -1) continue;
 
                 var key = line[..splitPosition];
                 var value = splitPosition + 1 < line.Length

src/Packer/Models/Providers/TextFile.cs

@@ -38,16 +38,6 @@ public static TextFile Create(FileInfo file, string destination)
             return new TextFile(content, destination);
         }
 
-        /// <summary>
-        /// 从给定的<see cref="FileInfo"/>构造提供器
-        /// </summary>
-        /// <param name="path">读取源</param>
-        /// <param name="destination">目标地址</param>
-        public static TextFile Create(string path, string destination)
-        {
-            return new TextFile(File.ReadAllText(path), destination);
-        }
-
         /// <summary>
         /// 从给定的<see cref="FileInfo"/>模板和参数构造提供器
         /// </summary>
@@ -77,11 +67,9 @@ public TextFile(string content, string destination)
         /// <inheritdoc/>
         public virtual IResourceFileProvider ApplyTo(IResourceFileProvider? baseProvider, ApplyOptions options)
         {
-            if (baseProvider is null)
-                return this;
+            if (baseProvider is null) return this;
 
-            if (!options.Append)
-                return baseProvider;
+            if (!options.Append) return baseProvider;
 
             if (baseProvider is not TextFile baseTextFile)
                 throw new ArgumentException($"Argument not an instance of {typeof(TextFile)}.",
@@ -106,7 +94,7 @@ public virtual IResourceFileProvider ReplaceDestination(string searchPattern, st
                                           replacement,
                                           RegexOptions.Singleline));
         /// <inheritdoc/>
-        public virtual async Task WriteToArchiveAsync(ZipArchive archive)
+        public virtual async Task WriteToArchive(ZipArchive archive)
         {
             var destination = Destination.NormalizePath();
             Log.Debug("[TextFile]写入路径 {0}", destination);

src/Packer/Program.cs

@@ -34,16 +34,17 @@ public static async Task Main(string version, bool increment = false)
                 // ./projects/assets/<projectSlug>...
                 from modDirectory in new DirectoryInfo("./projects/assets").EnumerateDirectories()
                 let modIdentifier = modDirectory.Name
-                where !targetModIdentifiers.Any()                            // 未提供列表，全部打包
+                where targetModIdentifiers.Count() == 0                             // 未提供列表，全部打包
                     || targetModIdentifiers.Contains(modIdentifier)                 // 有列表，仅打包列表中的项
+                where !config.Base.ExclusionMods.Contains(modIdentifier)            // 没有被明确排除
                 // .../<version>
                 let versionedDirectory = modDirectory.GetDirectories(config.Base.Version).FirstOrDefault(defaultValue: null)
                 where versionedDirectory is not null
                 // .../<namespace>-CFPA-<author>
                 from namespaceDirectory in versionedDirectory.EnumerateDirectories()
                 let namespaceName = namespaceDirectory.Name
                 where !config.Base.ExclusionNamespaces.Contains(namespaceName)      // 没有被明确排除
-                    && namespaceName.ValidateNamespace()                             // 不是非法名称
+                where namespaceName.ValidateNamespace()                             // 不是非法名称
                 // .../*
                 from provider in namespaceDirectory.EnumerateProviders(config)
                 group provider by provider.Destination into destinationGroup
@@ -67,7 +68,7 @@ select config.Floating.DestinationReplacement                       // 全局路
 
             IEnumerable<IResourceFileProvider> initialFiles = [
                 new RawFile(new FileInfo("./projects/templates/pack.png"), "pack.png"),
-                TextFile.Create("./projects/templates/LICENSE", "LICENSE"),
+                TextFile.Create(new FileInfo("./projects/templates/LICENSE"), "LICENSE"),
                 TextFile.CreateFromTemplate(new FileInfo(config.Base.ReadmeTemplate),
                     "README.txt",
                     config.Base.ReadmeParameters),
@@ -80,11 +81,9 @@ select config.Floating.DestinationReplacement                       // 全局路
             await using var stream = File.Create(packName);
 
             using (var archive = new ZipArchive(stream, ZipArchiveMode.Update, leaveOpen: true))
-            { 
-                foreach (var item in query.Concat(initialFiles))
-                {
-                    await item.WriteToArchiveAsync(archive);
-                } 
+            {
+                await Task.WhenAll(from provider in query.Concat(initialFiles)
+                                   select provider.WriteToArchive(archive));
             }
 
             Log.Information("对版本 {0} 的打包结束。", version);