更新下载器对接逻辑和辅助方法

Author: lindexi

src/dotnetCampus.FileDownloader.Tool/Program.cs

@@ -26,14 +26,15 @@ static async Task Main(string[] args)
                          "https://download.jetbrains.8686c.com/resharper/ReSharperUltimate.2020.1.3/JetBrains.ReSharperUltimate.2020.1.3.exe";
                      //var md5 = "7d6bbeb6617a7c0b7e615098fca1b167";// resharper
 
-                     url = "http://localhost:5000";
+                     //url = "http://localhost:5000";
+                     url =
+                         "https://dscache.tencent-cloud.cn/upload//ES_686_194-4f155229efeef75bb9c9a3995060c766dc0eac28.png";
 
                      var file = new FileInfo(@"File.txt");
 
                      var progress = new Progress<DownloadProgress>();
 
-                     var segmentFileDownloader = new SegmentFileDownloader(url, file, logger, progress);
-                     await segmentFileDownloader.DownloadFileAsync();
+                     await FileDownloaderHelper.DownloadFileAsync(url, file, progress:progress);
 #endif
                      await Task.Delay(100);
                  });
@@ -76,7 +77,7 @@ private static async Task DownloadFileAsync(DownloadOption option)
 
                 var file = new FileInfo(output);
                 var url = option.Url;
-                var segmentFileDownloader = new SegmentFileDownloader(url, file, logger, progress);
+                using var segmentFileDownloader = new SegmentFileDownloaderByHttpClient(url, file, httpClient:null, logger, progress);
 
                 await segmentFileDownloader.DownloadFileAsync();
 

src/dotnetCampus.FileDownloader/FileDownloaderHelper.cs

@@ -12,7 +12,9 @@
 using System.Security.AccessControl;
 using System.Threading;
 using System.Threading.Tasks;
+
 using dotnetCampus.FileDownloader.Utils;
+
 using Microsoft.Extensions.Logging;
 
 namespace dotnetCampus.FileDownloader
@@ -34,14 +36,20 @@ public static class FileDownloaderHelper
         /// <param name="bufferLength">缓存的数组长度，默认是 65535 的长度</param>
         /// <param name="stepTimeOut">每一步 每一分段下载超时时间 默认 10 秒</param>
         /// <returns></returns>
-        public static Task DownloadFileAsync(string url, FileInfo file,
+        public static async Task DownloadFileAsync(string url, FileInfo file,
             ILogger<SegmentFileDownloader>? logger = null,
             IProgress<DownloadProgress>? progress = null, ISharedArrayPool? sharedArrayPool = null,
             int bufferLength = ushort.MaxValue, TimeSpan? stepTimeOut = null)
         {
-            var segmentFileDownloader = new SegmentFileDownloader(url, file, logger, progress, sharedArrayPool, bufferLength, stepTimeOut);
+#if NETCOREAPP3_1_OR_GREATER
+            using var segmentFileDownloaderByHttpClient = new SegmentFileDownloaderByHttpClient(url, file, httpClient: null, logger, progress, sharedArrayPool, bufferLength, stepTimeOut);
+            await segmentFileDownloaderByHttpClient.DownloadFileAsync();
+#else
+            var segmentFileDownloader =
+ new SegmentFileDownloader(url, file, logger, progress, sharedArrayPool, bufferLength, stepTimeOut);
 
-            return segmentFileDownloader.DownloadFileAsync();
+            await segmentFileDownloader.DownloadFileAsync();
+#endif
         }
 
         /// <summary>
@@ -79,10 +87,10 @@ public static async Task<FileInfo> DownloadFileToFolderAsync(string url, Directo
             var downloadFile = new FileInfo(Path.Combine(tempFolder.FullName, fileName));
 
 #if NETCOREAPP3_1_OR_GREATER
-           using var segmentFileDownloader = new InnerSegmentFileDownloaderByHttpClient(url, downloadFile, httpClient: null,
-                logger, progress, sharedArrayPool, bufferLength, stepTimeOut);
+            using var segmentFileDownloader = new InnerSegmentFileDownloaderByHttpClient(url, downloadFile, httpClient: null,
+                 logger, progress, sharedArrayPool, bufferLength, stepTimeOut);
 
-           await segmentFileDownloader.DownloadFileAsync();
+            await segmentFileDownloader.DownloadFileAsync();
 
             // 下载完成了之后，尝试移动文件夹
             // 优先使用服务器返回的文件名