Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report zip progress based on bytes copied

Browse Source
This commit is contained in:
caesay
2024-03-26 14:04:03 +00:00
parent 9004a6cb3c
commit bf509d248a
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Velopack/Compression/EasyZip.cs
View File

@@ -111,6 +111,9 @@ namespace Velopack.Compression
DirectoryInfo directoryInfo = new DirectoryInfo(sourceDirectoryName);
string fullName = directoryInfo.FullName;
long totalBytes = directoryInfo.EnumerateFiles("*", SearchOption.AllDirectories).Sum(f => f.Length);
long processedBytes = 0L;
var directories = directoryInfo
.EnumerateDirectories("*", SearchOption.AllDirectories)
.Concat(new[] { directoryInfo })
@@ -174,11 +177,17 @@ namespace Velopack.Compression
using Stream stream = File.Open(sourceFileName, FileMode.Open, FileAccess.Read, FileShare.Read);
ZipArchiveEntry zipArchiveEntry = zipArchive.CreateEntry(entryName, compressionLevel);
zipArchiveEntry.LastWriteTime = ZipFormatMinDate;
using (Stream destination = zipArchiveEntry.Open()) {
await stream.CopyToAsync(destination, 81920, cancelToken).ConfigureAwait(false);
}
progress((int) ((double) i / files.Length * 100));
byte[] buffer = new byte[81920];
int bytesRead;
using (Stream destination = zipArchiveEntry.Open()) {
while ((bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, cancelToken).ConfigureAwait(false)) > 0) {
cancelToken.ThrowIfCancellationRequested();
await destination.WriteAsync(buffer, 0, bytesRead, cancelToken).ConfigureAwait(false);
processedBytes += bytesRead;
progress((int) ((double) ++processedBytes / totalBytes * 100));
}
}
}
}
}