Merge pull request #4009 from axmanalad/main

Fix download progress reset conditionally

Author: Al12rs

src/NexusMods.Networking.HttpDownloader/HttpDownloadJob.cs

@@ -117,27 +117,28 @@ private async ValueTask<AbsolutePath> StartAsyncImpl(IJobContext<HttpDownloadJob
         await context.YieldAsync();
         await using var fileStream = Destination.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.Read);
 
+        fileStream.Position = (long)_state.TotalBytesDownloaded.Value;
+        
         await using var outputStream = new StreamProgressWrapper<IJobContext<HttpDownloadJob>>(
             fileStream,
             context,
             (state, tuple) =>
-        {
-            var (bytesWritten, speed) = tuple;
+            {
+                var (bytesWritten, speed) = tuple;
 
-            _state.TotalBytesDownloaded = bytesWritten;
-            
-            state.SetPercent(bytesWritten, _state.ContentLength.ValueOr(static () => Size.One));
-            state.SetRateOfProgress(speed);
-        });
+                _state.TotalBytesDownloaded = bytesWritten;
+
+                state.SetPercent(bytesWritten, _state.ContentLength.ValueOr(static () => Size.One));
+                state.SetRateOfProgress(speed);
+            }
+        );
 
         if (_state.ContentLength.HasValue)
         {
             var contentLength = (long)_state.ContentLength.Value.Value;
             if (outputStream.Length != contentLength) outputStream.SetLength(contentLength);
         }
 
-        outputStream.Position = (long)_state.TotalBytesDownloaded.Value;
-
         await context.YieldAsync();
         using var request = PrepareRequest(out var isRangeRequest);
         using var response = await Client.SendAsync(

src/NexusMods.Sdk/Jobs/StreamProgressWrapper.cs

@@ -31,6 +31,10 @@ public StreamProgressWrapper(
         timeProvider ??= TimeProvider.System;
 
         _timer = timeProvider.CreateTimer(NotifyLoop, state: this, dueTime: TimeSpan.Zero, period: _period);
+        
+        var pos = Size.FromLong(_innerStream.Position);
+        _currentBytesWritten = pos;
+        _lastBytesWritten = pos;
     }
 
     private readonly TimeSpan _period;