Merge pull request #1379 from abpframework/maliming/zip

Resolve #1114 Use the new zip class library (SharpZipLib)

framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ionic.Zip" Version="1.9.1.8" />
+    <PackageReference Include="SharpZipLib" Version="1.1.0" />
     <PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
     <PackageReference Include="NuGet.Versioning" Version="5.1.0" />

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -2,7 +2,8 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Ionic.Zip;
+using ICSharpCode.SharpZipLib.Core;
+using ICSharpCode.SharpZipLib.Zip;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Cli.Args;
@@ -61,9 +62,33 @@ public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
 
             using (var templateFileStream = new MemoryStream(result.ZipContent))
             {
-                using (var templateZipFile = ZipFile.Read(templateFileStream))
+                using (var zipInputStream = new ZipInputStream(templateFileStream))
                 {
-                    templateZipFile.ExtractAll(outputFolder, ExtractExistingFileAction.Throw);
+                    var zipEntry = zipInputStream.GetNextEntry();
+                    while (zipEntry != null)
+                    {
+                        var fullZipToPath = Path.Combine(outputFolder, zipEntry.Name);
+                        var directoryName = Path.GetDirectoryName(fullZipToPath);
+
+                        if (!string.IsNullOrEmpty(directoryName))
+                        {
+                            Directory.CreateDirectory(directoryName);
+                        }
+
+                        var fileName = Path.GetFileName(fullZipToPath);
+                        if (fileName.Length == 0)
+                        {
+                            zipEntry = zipInputStream.GetNextEntry();
+                            continue;
+                        }
+
+                        var buffer = new byte[4096]; // 4K is optimum
+                        using (var streamWriter = File.Create(fullZipToPath))
+                        {
+                            StreamUtils.Copy(zipInputStream, streamWriter, buffer);
+                        }
+                        zipEntry = zipInputStream.GetNextEntry();
+                    }
                 }
             }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs

@@ -1,6 +1,6 @@
-using Ionic.Zip;
+using System.IO;
+using ICSharpCode.SharpZipLib.Zip;
 using Volo.Abp.Cli.ProjectBuilding.Files;
-using Volo.Abp.Cli.ProjectBuilding.Zipping;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
@@ -13,10 +13,27 @@ public override void Execute(ProjectBuildContext context)
 
         private static byte[] CreateZipFileFromEntries(FileEntryList entries)
         {
-            using (var resultZipFile = new ZipFile())
+            using (var memoryStream = new MemoryStream())
             {
-                entries.CopyToZipFile(resultZipFile);
-                return resultZipFile.GetBytes();
+                using (var zipOutputStream = new ZipOutputStream(memoryStream))
+                {
+                    zipOutputStream.SetLevel(3); //0-9, 9 being the highest level of compression
+
+                    foreach (var entry in entries)
+                    {
+                        zipOutputStream.PutNextEntry(new ZipEntry(entry.Name)
+                        {
+                            Size = entry.Bytes.Length
+                        });
+                        zipOutputStream.Write(entry.Bytes, 0, entry.Bytes.Length);
+                    }
+
+                    zipOutputStream.CloseEntry();
+                    zipOutputStream.IsStreamOwner = false;
+                }
+
+                memoryStream.Position = 0;
+                return memoryStream.ToArray();
             }
         }
     }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs

@@ -1,7 +1,9 @@
-using System.IO;
-using Ionic.Zip;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using ICSharpCode.SharpZipLib.Core;
+using ICSharpCode.SharpZipLib.Zip;
 using Volo.Abp.Cli.ProjectBuilding.Files;
-using Volo.Abp.Cli.ProjectBuilding.Zipping;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
@@ -14,12 +16,28 @@ public override void Execute(ProjectBuildContext context)
 
         private static FileEntryList GetEntriesFromZipFile(byte[] fileBytes)
         {
+            var fileEntries = new List<FileEntry>();
+
             using (var memoryStream = new MemoryStream(fileBytes))
             {
-                using (var templateZipFile = ZipFile.Read(memoryStream))
+                using (var zipInputStream = new ZipInputStream(memoryStream))
                 {
-                    return templateZipFile.ToFileEntryList();
+                    var zipEntry = zipInputStream.GetNextEntry();
+                    while (zipEntry != null)
+                    {
+                        var buffer = new byte[4096]; // 4K is optimum
+
+                        using (var fileEntryMemoryStream = new MemoryStream())
+                        {
+                            StreamUtils.Copy(zipInputStream, fileEntryMemoryStream, buffer);
+                            fileEntries.Add(new FileEntry(zipEntry.Name.EnsureStartsWith('/'), fileEntryMemoryStream.ToArray(), zipEntry.IsDirectory));
+                        }
+
+                        zipEntry = zipInputStream.GetNextEntry();
+                    }
                 }
+
+                return new FileEntryList(fileEntries);
             }
         }
     }