rusty-hearts/RustyHearts-Launcher
2
0
Fork 0
mirror of https://github.com/JuniorDark/RustyHearts-Launcher.git synced 2026-05-07 05:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor zip handling for System.IO.Compression

Browse source
This commit is contained in:
Junior 2024-11-28 07:51:57 -03:00
parent 9fb4b4a6af
commit 8526698244
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
RHLauncher.Http/ClientDownloader.cs
View file

@ -1,8 +1,8 @@
using System.IO.Compression; using RHLauncher.RHLauncher.Helper;
using RHLauncher.RHLauncher.Helper;
using RHLauncher.RHLauncher.i8n; using RHLauncher.RHLauncher.i8n;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO.Compression;
using System.Net; using System.Net;
namespace RHLauncher.RHLauncher.Http namespace RHLauncher.RHLauncher.Http
@ -152,8 +152,11 @@ namespace RHLauncher.RHLauncher.Http
// Calculate total uncompressed size of all files in all zip archives // Calculate total uncompressed size of all files in all zip archives
long totalUncompressedSize = fileEntries.Sum(file => long totalUncompressedSize = fileEntries.Sum(file =>
{ {
using ZipArchive zip = ZipFile.OpenRead(file); using FileStream fs = new(file, FileMode.Open, FileAccess.Read);
return zip.Entries.Sum(entry => entry.Length); using ZipArchive zip = new(fs, ZipArchiveMode.Read);
static long entryLength(ZipArchiveEntry entry) => entry.Length;
return zip.Entries.Sum(entryLength);
}); });
long totalExtracted = 0; long totalExtracted = 0;
@ -163,7 +166,8 @@ namespace RHLauncher.RHLauncher.Http
{ {
await Task.Run(() => await Task.Run(() =>
{ {
using ZipArchive zip = ZipFile.OpenRead(file); using FileStream fs = new(file, FileMode.Open, FileAccess.Read);
using ZipArchive zip = new(fs, ZipArchiveMode.Read);
foreach (var entry in zip.Entries) foreach (var entry in zip.Entries)
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@ -175,7 +179,7 @@ namespace RHLauncher.RHLauncher.Http
Directory.CreateDirectory(directoryPath); Directory.CreateDirectory(directoryPath);
} }
entry.ExtractToFile(destinationPath, true); entry.ExtractToFile(destinationPath, overwrite: true);
totalExtracted += entry.Length; totalExtracted += entry.Length;
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();