Commit08002ef

committed

fix: fix Downloader to always dispose of temp file stream

1 parenta58864e commit08002efCopy full SHA for 08002ef

File tree

+13

-14

lines changed

+13

-14

lines changed

Lines changed: 13 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -453,27 +453,26 @@ private async Task Start(CancellationToken ct = default)`
`453`	`453`	`if(res.Content.Headers.ContentLength>=0)`
`454`	`454`	`TotalBytes=(ulong)res.Content.Headers.ContentLength;`
`455`	`455`
`456`		`-FileStreamtempFile;`
`457`		`-try`
`458`		`-{`
`459`		`-tempFile=File.Create(TempDestinationPath,BufferSize,`
`460`		`-FileOptions.Asynchronous\|FileOptions.SequentialScan);`
`461`		`-}`
`462`		`-catch(Exceptione)`
`463`		`-{`
`464`		`-_logger.LogError(e,"Failed to create temporary file '{TempDestinationPath}'",TempDestinationPath);`
`465`		`-throw;`
`466`		`-}`
`467`		`-`
`468`		`-awaitDownload(res,tempFile,ct);`
	`456`	`+awaitDownload(res,ct);`
`469`	`457`	`return;`
`470`	`458`	`}`
`471`	`459`
`472`		`-privateasyncTaskDownload(HttpResponseMessageres,FileStreamtempFile,CancellationTokenct)`
	`460`	`+privateasyncTaskDownload(HttpResponseMessageres,CancellationTokenct)`
`473`	`461`	`{`
`474`	`462`	`try`
`475`	`463`	`{`
`476`	`464`	`varsha1=res.Headers.Contains("ETag")?SHA1.Create():null;`
	`465`	`+FileStreamtempFile;`
	`466`	`+try`
	`467`	`+{`
	`468`	`+tempFile=File.Create(TempDestinationPath,BufferSize,`
	`469`	`+FileOptions.Asynchronous\|FileOptions.SequentialScan);`
	`470`	`+}`
	`471`	`+catch(Exceptione)`
	`472`	`+{`
	`473`	`+_logger.LogError(e,"Failed to create temporary file '{TempDestinationPath}'",TempDestinationPath);`
	`474`	`+throw;`
	`475`	`+}`
`477`	`476`	`awaitusing(tempFile)`
`478`	`477`	`{`
`479`	`478`	`varstream=awaitres.Content.ReadAsStreamAsync(ct);`

Comments

(0)