feat(IZipArchiveService): compatible with older versions

src/BootstrapBlazor.Server/Components/Samples/ZipArchives.razor

@@ -1,4 +1,4 @@
-@page "/zip-archive"
+@page "/zip-archive"
 @layout MainLayout
 @inject IStringLocalizer<ZipArchives> Localizer
 
@@ -13,10 +13,14 @@ private IZipArchiveService? ZipArchiveService { get; set; }</Pre>
 <p>@Localizer["ZipArchiveFileText"]</p>
 <Pre class="mb-3">Task&lt;Stream&gt; ArchiveAsync(IEnumerable&lt;string&gt; files, ArchiveOptions? options = null);
 
-Task ArchiveAsync(string archiveFileName, IEnumerable&lt;string&gt; files, ArchiveOptions? options = null);</Pre>
+Task ArchiveAsync(string archiveFile, IEnumerable&lt;string&gt; files, ArchiveOptions? options = null);
+
+Task&lt;Stream&gt; ArchiveAsync(IEnumerable&lt;ArchiveEntry&gt; entries, ArchiveOptions? options = null);
+
+Task ArchiveAsync(string archiveFile, IEnumerable&lt;ArchiveEntry&gt; entries, ArchiveOptions? options = null);</Pre>
 
 <p>@Localizer["ZipArchiveDirectoryText"]</p>
-<Pre class="mb-3">Task ArchiveDirectory(string archiveFileName, string directoryName, CompressionLevel compressionLevel = CompressionLevel.Optimal, bool includeBaseDirectory = false, Encoding? encoding = null);</Pre>
+<Pre class="mb-3">Task ArchiveDirectoryAsync(string archiveFile, string directoryName, CompressionLevel compressionLevel = CompressionLevel.Optimal, bool includeBaseDirectory = false, Encoding? encoding = null);</Pre>
 
 <p>@Localizer["ZipArchiveExtractText"]</p>
-<Pre class="mb-3">bool ExtractToDirectory(string archiveFile, string destinationDirectoryName, bool overwriteFiles = false, Encoding? encoding = null);</Pre>
+<Pre class="mb-3">Task&lt;bool&gt; ExtractToDirectoryAsync(string archiveFile, string destinationDirectoryName, bool overwriteFiles = false, Encoding? encoding = null);</Pre>

src/BootstrapBlazor/Services/DefaultZipArchiveService.cs

@@ -10,6 +10,24 @@ namespace BootstrapBlazor.Components;
 
 class DefaultZipArchiveService : IZipArchiveService
 {
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public Task<Stream> ArchiveAsync(IEnumerable<string> files, ArchiveOptions? options = null) => ArchiveAsync(files.Select(f => new ArchiveEntry()
+    {
+        SourceFileName = f,
+        EntryName = Path.GetFileName(f),
+    }), options);
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public Task ArchiveAsync(string archiveFile, IEnumerable<string> files, ArchiveOptions? options = null) => ArchiveAsync(archiveFile, files.Select(f => new ArchiveEntry()
+    {
+        SourceFileName = f,
+        EntryName = Path.GetFileName(f),
+    }), options);
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -28,7 +46,7 @@ public async Task<Stream> ArchiveAsync(IEnumerable<ArchiveEntry> entries, Archiv
     /// </summary>
     public async Task ArchiveAsync(string archiveFile, IEnumerable<ArchiveEntry> entries, ArchiveOptions? options = null)
     {
-        using var stream = File.OpenWrite(archiveFile);
+        await using var stream = File.OpenWrite(archiveFile);
         await ArchiveFilesAsync(stream, entries, options);
     }
 
@@ -48,14 +66,16 @@ private static async Task ArchiveFilesAsync(Stream stream, IEnumerable<ArchiveEn
             else if (Directory.Exists(f.SourceFileName))
             {
                 var entryName = f.EntryName;
-                if (!string.IsNullOrEmpty(entryName))
+                if (string.IsNullOrEmpty(entryName))
+                {
+                    continue;
+                }
+
+                if (!entryName.EndsWith('/'))
                 {
-                    if (!entryName.EndsWith('/'))
-                    {
-                        entryName = $"{entryName}/";
-                    }
-                    archive.CreateEntry(entryName, f.CompressionLevel ?? options.CompressionLevel);
+                    entryName = $"{entryName}/";
                 }
+                archive.CreateEntry(entryName, f.CompressionLevel ?? options.CompressionLevel);
             }
             else if (File.Exists(f.SourceFileName))
             {

src/BootstrapBlazor/Services/IZipArchiveService.cs

@@ -13,6 +13,22 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public interface IZipArchiveService
 {
+    /// <summary>
+    /// 将文件归档方法
+    /// </summary>
+    /// <param name="files">要归档的文件集合</param>
+    /// <param name="options">归档配置</param>
+    /// <returns>归档数据流</returns>
+    Task<Stream> ArchiveAsync(IEnumerable<string> files, ArchiveOptions? options = null);
+
+    /// <summary>
+    /// 将文件归档方法
+    /// </summary>
+    /// <param name="archiveFile">归档文件</param>
+    /// <param name="files">要归档的文件集合</param>
+    /// <param name="options">归档配置</param>
+    Task ArchiveAsync(string archiveFile, IEnumerable<string> files, ArchiveOptions? options = null);
+
     /// <summary>
     /// 将文件归档方法
     /// </summary>