mirror/min-ed-launcher
3
0
Fork 0
mirror of https://github.com/rfvgyhn/min-ed-launcher.git synced 2026-02-04 17:15:42 +00:00
Code Issues Projects Releases Wiki Activity

make download progress concurrent friendly

Browse Source
This commit is contained in:
Chris
2021-04-20 19:10:16 -06:00
parent 0321dcbb8e
commit 5d95dd7078
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/MinEdLauncher/App.fs
View File

@ -205,14 +205,11 @@ let downloadFiles (httpClient: HttpClient) (throttler: SemaphoreSlim) destDir (p
use sha1 = SHA1.Create()
use fileStream = new FileStream(dest, FileMode.Create, FileAccess.Write, FileShare.Write, 4096, FileOptions.Asynchronous)
use cryptoStream = new CryptoStream(fileStream, sha1, CryptoStreamMode.Write) // Calculate hash as file is downloaded
let totalReads = ref 0L
let relativeProgress = Progress<int>(fun bytesRead ->
let bytesSoFar = Interlocked.Add(combinedBytesSoFar, int64 bytesRead)
let totalReads = Interlocked.Increment(totalReads) // Hack so that the console isn't written to too fast
if totalReads % 100L = 0L then
progress.Report({ TotalFiles = files.Length
BytesSoFar = bytesSoFar
TotalBytes = combinedTotalBytes }))
progress.Report({ TotalFiles = files.Length
BytesSoFar = bytesSoFar
TotalBytes = combinedTotalBytes }))
do! httpClient.DownloadAsync(file.Download, cryptoStream, relativeProgress, cancellationToken)
cryptoStream.Dispose()
let hash = sha1.Hash |> Hex.toString |> String.toLower
@ -269,8 +266,7 @@ let updateProduct (httpClient: HttpClient) (throttler: SemaphoreSlim) cancellati
let progress = Progress<DownloadProgress>(fun p ->
let total = p.TotalBytes |> Int64.toFriendlyByteString
let percent = float p.BytesSoFar / float p.TotalBytes
Console.SetCursorPosition(0, Console.CursorTop)
Console.Write($"Downloading %d{p.TotalFiles} files (%s{total}) - {percent:P0}"))
Console.Write($"\rDownloading %d{p.TotalFiles} files (%s{total}) - {percent:P0}"))
let writeHashCache path hashMap = task {
let! write =