optimize: 优雅！优雅！还是tmd优雅！

PCL.Neo.Core/FileExtension.cs

@@ -0,0 +1,84 @@
+using PCL.Neo.Core.Utils;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+
+namespace PCL.Neo.Core;
+
+/// <summary>
+/// 一些文件操作和下载请求之类的
+/// </summary>
+public static class FileExtension
+{
+    /// <summary>
+    /// 校验文件流与SHA-1是否匹配
+    /// </summary>
+    /// <param name="fileStream">文件流</param>
+    /// <param name="sha1">SHA-1</param>
+    /// <returns>是否匹配</returns>
+    public static async Task<bool> CheckSha1(this FileStream fileStream, string sha1)
+    {
+        using var sha1Provider = System.Security.Cryptography.SHA1.Create();
+        fileStream.Position = 0; // 重置文件流位置
+        var computedHash = await sha1Provider.ComputeHashAsync(fileStream);
+        var computedHashString = Convert.ToHexStringLower(computedHash);
+        return string.Equals(computedHashString, sha1, StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// 在 Unix 系统中给予可执行文件运行权限
+    /// </summary>
+    /// <param name="path">文件路径</param>
+    [SupportedOSPlatform(nameof(OSPlatform.OSX))]
+    [SupportedOSPlatform(nameof(OSPlatform.Linux))]
+    public static void SetFileExecutableUnix(this string path)
+    {
+        if (SystemUtils.Os is SystemUtils.RunningOs.Windows) return;
+        try
+        {
+            var currentMode = File.GetUnixFileMode(path);
+            var newMode = currentMode | UnixFileMode.UserExecute | UnixFileMode.GroupExecute |
+                          UnixFileMode.OtherExecute;
+            File.SetUnixFileMode(path, newMode);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine($"无法设置可执行权限：{e.Message}");
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// 从某个地方抄来的很像 C 语言风格的解压 LZMA 压缩算法的函数
+    /// </summary>
+    /// <param name="inStream">被压缩的文件流</param>
+    /// <param name="outputFile">输出文件路径</param>
+    /// <returns>解压后的文件流</returns>
+    public static FileStream? DecompressLZMA(this FileStream inStream, string outputFile)
+    {
+        inStream.Position = 0;
+        var outStream = new FileStream(outputFile, FileMode.Create, FileAccess.ReadWrite);
+        byte[] decodeProperties = new byte[5];
+        int n = inStream.Read(decodeProperties, 0, 5);
+        Debug.Assert(n == 5);
+        SevenZip.Compression.LZMA.Decoder decoder = new();
+        decoder.SetDecoderProperties(decodeProperties);
+        long outSize = 0;
+        for (int i = 0; i < 8; i++)
+        {
+            int v = inStream.ReadByte();
+            if (v < 0)
+            {
+                Console.WriteLine("read outSize error.");
+                return null;
+            }
+
+            outSize |= (long)(byte)v << (8 * i);
+        }
+
+        long compressedSize = inStream.Length - inStream.Position;
+        decoder.Code(inStream, outStream, compressedSize, outSize, null);
+        inStream.Close();
+        return outStream;
+    }
+}

PCL.Neo.Core/Helpers/FileHelper.cs → PCL.Neo.Core/Models/DownloadService.cs

@@ -1,15 +1,15 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace PCL.Neo.Core.Helpers;
+namespace PCL.Neo.Core.Models;
 
 /// <summary>
-/// 一些文件操作和下载请求之类的
+/// 下载任务管理器
+/// 之所以不static是因为后续可能需要接入进度显示和下载统计
 /// </summary>
-public static class FileHelper
+public class DownloadService
 {
-    public static readonly HttpClient HttpClient = new();
+    /// <summary>
+    /// 一个static的HttpClient，以便在任何地方调用
+    /// </summary>
+    public static HttpClient HttpClient { get; } = new();
 
     /// <summary>
     /// 从某个 URL 下载并保存文件
@@ -21,7 +21,7 @@ public static class FileHelper
     /// <param name="maxRetries">最大重试次数</param>
     /// <param name="cancellationToken">用于取消</param>
     /// <returns>向外传递的文件流</returns>
-    public static async Task<FileStream?> DownloadFileAsync(
+    public async Task<FileStream?> DownloadFileAsync(
         Uri uri, string localFilePath, string? sha1 = null, bool passStreamDown = false, int maxRetries = 3,
         CancellationToken cancellationToken = default)
     {
@@ -40,6 +40,7 @@ public static class FileHelper
                 try
                 {
                     await response.Content.CopyToAsync(fileStream, cancellationToken);
+                    response.EnsureSuccessStatusCode();
                     if (!string.IsNullOrEmpty(sha1))
                     {
                         fileStream.Position = 0;
@@ -73,82 +74,10 @@ public static class FileHelper
         }
     }
 
-    /// <summary>
-    /// 校验文件流与SHA-1是否匹配
-    /// </summary>
-    /// <param name="fileStream">文件流</param>
-    /// <param name="sha1">SHA-1</param>
-    /// <returns>是否匹配</returns>
-    private static async Task<bool> CheckSha1(this FileStream fileStream, string sha1)
-    {
-        using var sha1Provider = System.Security.Cryptography.SHA1.Create();
-        fileStream.Position = 0; // 重置文件流位置
-        var computedHash = await sha1Provider.ComputeHashAsync(fileStream);
-        var computedHashString = Convert.ToHexStringLower(computedHash);
-        return string.Equals(computedHashString, sha1, StringComparison.OrdinalIgnoreCase);
-    }
-
-    /// <summary>
-    /// 在 Unix 系统中给予可执行文件运行权限
-    /// </summary>
-    /// <param name="path">文件路径</param>
-    [SupportedOSPlatform(nameof(OSPlatform.OSX))]
-    [SupportedOSPlatform(nameof(OSPlatform.Linux))]
-    public static void SetFileExecutableUnix(this string path)
-    {
-        if (Const.Os is Const.RunningOs.Windows) return;
-        try
-        {
-            var currentMode = File.GetUnixFileMode(path);
-            var newMode = currentMode | UnixFileMode.UserExecute | UnixFileMode.GroupExecute |
-                          UnixFileMode.OtherExecute;
-            File.SetUnixFileMode(path, newMode);
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine($"无法设置可执行权限：{e.Message}");
-            throw;
-        }
-    }
-
-    /// <summary>
-    /// 从某个地方抄来的很像 C 语言风格的解压 LZMA 压缩算法的函数
-    /// </summary>
-    /// <param name="inStream">被压缩的文件流</param>
-    /// <param name="outputFile">输出文件路径</param>
-    /// <returns>解压后的文件流</returns>
-    private static FileStream? DecompressLZMA(this FileStream inStream, string outputFile)
-    {
-        inStream.Position = 0;
-        var outStream = new FileStream(outputFile, FileMode.Create, FileAccess.ReadWrite);
-        byte[] decodeProperties = new byte[5];
-        int n = inStream.Read(decodeProperties, 0, 5);
-        Debug.Assert(n == 5);
-        SevenZip.Compression.LZMA.Decoder decoder = new();
-        decoder.SetDecoderProperties(decodeProperties);
-        long outSize = 0;
-        for (int i = 0; i < 8; i++)
-        {
-            int v = inStream.ReadByte();
-            if (v < 0)
-            {
-                Console.WriteLine("read outSize error.");
-                return null;
-            }
-
-            outSize |= (long)(byte)v << (8 * i);
-        }
-
-        long compressedSize = inStream.Length - inStream.Position;
-        decoder.Code(inStream, outStream, compressedSize, outSize, null);
-        inStream.Close();
-        return outStream;
-    }
-
     /// <summary>
     /// 整合函数：下载并解压，然后删去原压缩文件
     /// </summary>
-    public static async Task DownloadAndDeCompressFileAsync(Uri uri, string localFilePath, string sha1Raw,
+    public async Task DownloadAndDeCompressFileAsync(Uri uri, string localFilePath, string sha1Raw,
         string sha1Lzma, CancellationToken cancellationToken = default)
     {
         var stream = await DownloadFileAsync(uri, localFilePath + ".lzma", sha1Lzma, true,