From 8e62880e23500c286c8a5ef367ea9ac5763a4531 Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Tue, 6 Apr 2021 16:55:53 +0200 Subject: [PATCH 1/5] Show error message if Goldberg could not be downloaded/extracted, prompting the user to do so manually. Try to skip getting DLC from SteamDB on error. --- GoldbergGUI.Core/Services/GoldbergService.cs | 56 +++++++++--- GoldbergGUI.Core/Services/SteamService.cs | 94 +++++++++++--------- 2 files changed, 96 insertions(+), 54 deletions(-) diff --git a/GoldbergGUI.Core/Services/GoldbergService.cs b/GoldbergGUI.Core/Services/GoldbergService.cs index 299ba96..4de2f33 100644 --- a/GoldbergGUI.Core/Services/GoldbergService.cs +++ b/GoldbergGUI.Core/Services/GoldbergService.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Net.Http; using System.Text.RegularExpressions; using System.Threading.Tasks; +using System.Windows; using GoldbergGUI.Core.Models; using GoldbergGUI.Core.Utils; using MvvmCross.Logging; @@ -85,7 +86,10 @@ namespace GoldbergGUI.Core.Services _log = log; var download = await Download().ConfigureAwait(false); - if (download) await Extract(_goldbergZipPath).ConfigureAwait(false); + if (download) + { + await Extract(_goldbergZipPath).ConfigureAwait(false); + } return await GetGlobalSettings().ConfigureAwait(false); } @@ -379,15 +383,24 @@ namespace GoldbergGUI.Core.Services private async Task StartDownload(string downloadUrl) { - var client = new HttpClient(); - _log.Debug(downloadUrl); - await using var fileStream = File.OpenWrite(_goldbergZipPath); - //client.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead) - var task = client.GetFileAsync(downloadUrl, fileStream).ConfigureAwait(false); - await task; - if (task.GetAwaiter().IsCompleted) + try { - _log.Info("Download finished!"); + var client = new HttpClient(); + _log.Debug(downloadUrl); + await using var fileStream = File.OpenWrite(_goldbergZipPath); + //client.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead) + var task = client.GetFileAsync(downloadUrl, fileStream).ConfigureAwait(false); + await task; + if (task.GetAwaiter().IsCompleted) + { + _log.Info("Download finished!"); + } + } + catch (Exception e) + { + ShowErrorMessage(); + _log.Error(e.ToString); + Environment.Exit(1); } } @@ -398,12 +411,33 @@ namespace GoldbergGUI.Core.Services _log.Debug("Start extraction..."); await Task.Run(() => { - Directory.Delete(_goldbergPath, true); - ZipFile.ExtractToDirectory(archivePath, _goldbergPath); + try + { + Directory.Delete(_goldbergPath, true); + ZipFile.ExtractToDirectory(archivePath, _goldbergPath); + } + catch (Exception e) + { + ShowErrorMessage(); + _log.Error(e.ToString); + Environment.Exit(1); + // throw; + } }).ConfigureAwait(false); _log.Debug("Extraction done!"); } + private void ShowErrorMessage() + { + if (Directory.Exists(_goldbergPath)) + { + Directory.Delete(_goldbergPath, true); + } + Directory.CreateDirectory(_goldbergPath); + MessageBox.Show("Could not setup Goldberg Emulator!\n" + + "Please download it manually and extract its content into the \"goldberg\" subfolder!"); + } + // https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/blob/master/generate_interfaces_file.cpp // (maybe) check DLL date first public async Task GenerateInterfacesFile(string filePath) diff --git a/GoldbergGUI.Core/Services/SteamService.cs b/GoldbergGUI.Core/Services/SteamService.cs index 300961e..3e23be6 100644 --- a/GoldbergGUI.Core/Services/SteamService.cs +++ b/GoldbergGUI.Core/Services/SteamService.cs @@ -215,57 +215,65 @@ namespace GoldbergGUI.Core.Services // Get Cloudflare cookie // Scrape and parse HTML page // Add missing to DLC list - + // ReSharper disable once InvertIf if (useSteamDb) { - var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/"); - - var client = new HttpClient(); - client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent); - - _log.Info("Get SteamDB App"); - var httpCall = client.GetAsync(steamDbUri); - var response = await httpCall.ConfigureAwait(false); - _log.Debug(httpCall.Status.ToString()); - _log.Debug(response.EnsureSuccessStatusCode().ToString()); - - var readAsStringAsync = response.Content.ReadAsStringAsync(); - var responseBody = await readAsStringAsync.ConfigureAwait(false); - _log.Debug(readAsStringAsync.Status.ToString()); - - var parser = new HtmlParser(); - var doc = parser.ParseDocument(responseBody); - - var query1 = doc.QuerySelector("#dlc"); - if (query1 != null) + try { - var query2 = query1.QuerySelectorAll(".app"); - foreach (var element in query2) - { - var dlcId = element.GetAttribute("data-appid"); - var query3 = element.QuerySelectorAll("td"); - var dlcName = query3 != null - ? query3[1].Text().Replace("\n", "").Trim() - : $"Unknown DLC {dlcId}"; - var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName}; - var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId)); - if (i > -1) - { - if (dlcList[i].Name.Contains("Unknown DLC")) dlcList[i] = dlcApp; - } - else - { - dlcList.Add(dlcApp); - } - } + var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/"); - dlcList.ForEach(x => _log.Debug($"{x.AppId}={x.Name}")); - _log.Info("Got DLC from SteamDB successfully..."); + var client = new HttpClient(); + client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent); + + _log.Info("Get SteamDB App"); + var httpCall = client.GetAsync(steamDbUri); + var response = await httpCall.ConfigureAwait(false); + _log.Debug(httpCall.Status.ToString()); + _log.Debug(response.EnsureSuccessStatusCode().ToString()); + + var readAsStringAsync = response.Content.ReadAsStringAsync(); + var responseBody = await readAsStringAsync.ConfigureAwait(false); + _log.Debug(readAsStringAsync.Status.ToString()); + + var parser = new HtmlParser(); + var doc = parser.ParseDocument(responseBody); + + var query1 = doc.QuerySelector("#dlc"); + if (query1 != null) + { + var query2 = query1.QuerySelectorAll(".app"); + foreach (var element in query2) + { + var dlcId = element.GetAttribute("data-appid"); + var query3 = element.QuerySelectorAll("td"); + var dlcName = query3 != null + ? query3[1].Text().Replace("\n", "").Trim() + : $"Unknown DLC {dlcId}"; + var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName}; + var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId)); + if (i > -1) + { + if (dlcList[i].Name.Contains("Unknown DLC")) dlcList[i] = dlcApp; + } + else + { + dlcList.Add(dlcApp); + } + } + + dlcList.ForEach(x => _log.Debug($"{x.AppId}={x.Name}")); + _log.Info("Got DLC from SteamDB successfully..."); + } + else + { + _log.Error("Could not get DLC from SteamDB!"); + } } - else + catch (Exception e) { _log.Error("Could not get DLC from SteamDB!"); + _log.Error(e.ToString); } } } From 653e97beab1d78fbf7fb813223783760c644c4e9 Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Wed, 7 Apr 2021 13:52:56 +0200 Subject: [PATCH 2/5] Improve verbosity of logs --- GoldbergGUI.Core/Services/SteamService.cs | 100 +++++++++++----------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/GoldbergGUI.Core/Services/SteamService.cs b/GoldbergGUI.Core/Services/SteamService.cs index 3e23be6..b3d77e2 100644 --- a/GoldbergGUI.Core/Services/SteamService.cs +++ b/GoldbergGUI.Core/Services/SteamService.cs @@ -193,10 +193,10 @@ namespace GoldbergGUI.Core.Services public async Task> GetListOfDlc(SteamApp steamApp, bool useSteamDb) { - _log.Info("Get DLC"); var dlcList = new List(); if (steamApp != null) { + _log.Info($"Get DLC for App {steamApp}"); var task = AppDetails.GetAsync(steamApp.AppId); var steamAppDetails = await task.ConfigureAwait(true); if (steamAppDetails.Type == AppType.Game.Value) @@ -216,66 +216,66 @@ namespace GoldbergGUI.Core.Services // Scrape and parse HTML page // Add missing to DLC list - // ReSharper disable once InvertIf - if (useSteamDb) + // Return current list if we don't intend to use SteamDB + if (!useSteamDb) return dlcList; + + try { - try + var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/"); + + var client = new HttpClient(); + client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent); + + _log.Info($"Get SteamDB App {steamApp}"); + var httpCall = client.GetAsync(steamDbUri); + var response = await httpCall.ConfigureAwait(false); + _log.Debug(httpCall.Status.ToString()); + _log.Debug(response.EnsureSuccessStatusCode().ToString()); + + var readAsStringAsync = response.Content.ReadAsStringAsync(); + var responseBody = await readAsStringAsync.ConfigureAwait(false); + _log.Debug(readAsStringAsync.Status.ToString()); + + var parser = new HtmlParser(); + var doc = parser.ParseDocument(responseBody); + + var query1 = doc.QuerySelector("#dlc"); + if (query1 != null) { - var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/"); - - var client = new HttpClient(); - client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent); - - _log.Info("Get SteamDB App"); - var httpCall = client.GetAsync(steamDbUri); - var response = await httpCall.ConfigureAwait(false); - _log.Debug(httpCall.Status.ToString()); - _log.Debug(response.EnsureSuccessStatusCode().ToString()); - - var readAsStringAsync = response.Content.ReadAsStringAsync(); - var responseBody = await readAsStringAsync.ConfigureAwait(false); - _log.Debug(readAsStringAsync.Status.ToString()); - - var parser = new HtmlParser(); - var doc = parser.ParseDocument(responseBody); - - var query1 = doc.QuerySelector("#dlc"); - if (query1 != null) + _log.Info("Got list of DLC from SteamDB."); + var query2 = query1.QuerySelectorAll(".app"); + foreach (var element in query2) { - var query2 = query1.QuerySelectorAll(".app"); - foreach (var element in query2) + var dlcId = element.GetAttribute("data-appid"); + var query3 = element.QuerySelectorAll("td"); + var dlcName = query3 != null + ? query3[1].Text().Replace("\n", "").Trim() + : $"Unknown DLC {dlcId}"; + var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName}; + var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId)); + if (i > -1) { - var dlcId = element.GetAttribute("data-appid"); - var query3 = element.QuerySelectorAll("td"); - var dlcName = query3 != null - ? query3[1].Text().Replace("\n", "").Trim() - : $"Unknown DLC {dlcId}"; - var dlcApp = new SteamApp {AppId = Convert.ToInt32(dlcId), Name = dlcName}; - var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId)); - if (i > -1) - { - if (dlcList[i].Name.Contains("Unknown DLC")) dlcList[i] = dlcApp; - } - else - { - dlcList.Add(dlcApp); - } + if (dlcList[i].Name.Contains("Unknown DLC")) dlcList[i] = dlcApp; } + else + { + dlcList.Add(dlcApp); + } + } - dlcList.ForEach(x => _log.Debug($"{x.AppId}={x.Name}")); - _log.Info("Got DLC from SteamDB successfully..."); - } - else - { - _log.Error("Could not get DLC from SteamDB!"); - } + dlcList.ForEach(x => _log.Debug($"{x.AppId}={x.Name}")); + _log.Info("Got DLC from SteamDB successfully..."); } - catch (Exception e) + else { _log.Error("Could not get DLC from SteamDB!"); - _log.Error(e.ToString); } } + catch (Exception e) + { + _log.Error("Could not get DLC from SteamDB! Skipping..."); + _log.Error(e.ToString); + } } else { From 62abe0e21248f33aea0151ed9ee623fe63800baf Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Wed, 7 Apr 2021 14:22:45 +0200 Subject: [PATCH 3/5] Improved extraction. --- GoldbergGUI.Core/Services/GoldbergService.cs | 90 ++++++++++++++------ 1 file changed, 65 insertions(+), 25 deletions(-) diff --git a/GoldbergGUI.Core/Services/GoldbergService.cs b/GoldbergGUI.Core/Services/GoldbergService.cs index 4de2f33..a6f5617 100644 --- a/GoldbergGUI.Core/Services/GoldbergService.cs +++ b/GoldbergGUI.Core/Services/GoldbergService.cs @@ -23,7 +23,9 @@ namespace GoldbergGUI.Core.Services public Task Save(string path, GoldbergConfiguration configuration); public Task GetGlobalSettings(); public Task SetGlobalSettings(GoldbergGlobalConfiguration configuration); + public bool GoldbergApplied(string path); + // public Task Download(); // public Task Extract(string archivePath); public Task GenerateInterfacesFile(string filePath); @@ -48,7 +50,9 @@ namespace GoldbergGUI.Core.Services private readonly string _accountNamePath = Path.Combine(GlobalSettingsPath, "settings/account_name.txt"); private readonly string _userSteamIdPath = Path.Combine(GlobalSettingsPath, "settings/user_steam_id.txt"); private readonly string _languagePath = Path.Combine(GlobalSettingsPath, "settings/language.txt"); - private readonly string _customBroadcastIpsPath = Path.Combine(GlobalSettingsPath, "settings/custom_broadcasts.txt"); + + private readonly string _customBroadcastIpsPath = + Path.Combine(GlobalSettingsPath, "settings/custom_broadcasts.txt"); // ReSharper disable StringLiteralTypo private readonly List _interfaceNames = new List @@ -90,6 +94,7 @@ namespace GoldbergGUI.Core.Services { await Extract(_goldbergZipPath).ConfigureAwait(false); } + return await GetGlobalSettings().ConfigureAwait(false); } @@ -110,6 +115,7 @@ namespace GoldbergGUI.Core.Services { _log.Error("Invalid User Steam ID!"); } + if (File.Exists(_languagePath)) language = File.ReadLines(_languagePath).First().Trim(); if (File.Exists(_customBroadcastIpsPath)) customBroadcastIps.AddRange( @@ -146,21 +152,23 @@ namespace GoldbergGUI.Core.Services await File.Create(_accountNamePath).DisposeAsync().ConfigureAwait(false); await File.WriteAllTextAsync(_accountNamePath, DefaultAccountName).ConfigureAwait(false); } + // User SteamID if (userSteamId >= 76561197960265729 && userSteamId <= 76561202255233023) { _log.Info("Setting user Steam ID..."); - if (!File.Exists(_userSteamIdPath)) + if (!File.Exists(_userSteamIdPath)) await File.Create(_userSteamIdPath).DisposeAsync().ConfigureAwait(false); await File.WriteAllTextAsync(_userSteamIdPath, userSteamId.ToString()).ConfigureAwait(false); } else { _log.Info("Invalid user Steam ID! Skipping..."); - if (!File.Exists(_userSteamIdPath)) + if (!File.Exists(_userSteamIdPath)) await File.Create(_userSteamIdPath).DisposeAsync().ConfigureAwait(false); await File.WriteAllTextAsync(_userSteamIdPath, DefaultSteamId.ToString()).ConfigureAwait(false); } + // Language if (!string.IsNullOrEmpty(language)) { @@ -176,11 +184,12 @@ namespace GoldbergGUI.Core.Services await File.Create(_languagePath).DisposeAsync().ConfigureAwait(false); await File.WriteAllTextAsync(_languagePath, DefaultLanguage).ConfigureAwait(false); } + // Custom Broadcast IPs if (customBroadcastIps != null && customBroadcastIps.Count > 0) { _log.Info("Setting custom broadcast IPs..."); - var result = + var result = customBroadcastIps.Aggregate("", (current, address) => $"{current}{address}\n"); if (!File.Exists(_customBroadcastIpsPath)) await File.Create(_customBroadcastIpsPath).DisposeAsync().ConfigureAwait(false); @@ -274,7 +283,8 @@ namespace GoldbergGUI.Core.Services } // create steam_appid.txt - await File.WriteAllTextAsync(Path.Combine(path, "steam_appid.txt"), c.AppId.ToString()).ConfigureAwait(false); + await File.WriteAllTextAsync(Path.Combine(path, "steam_appid.txt"), c.AppId.ToString()) + .ConfigureAwait(false); // DLC if (c.DlcList.Count > 0) @@ -366,16 +376,24 @@ namespace GoldbergGUI.Core.Services var match = regex.Match(body); if (File.Exists(jobIdPath)) { - _log.Info("Check if update is needed..."); - var jobIdLocal = Convert.ToInt32(File.ReadLines(jobIdPath).First().Trim()); - var jobIdRemote = Convert.ToInt32(match.Groups["jobid"].Value); - _log.Debug($"job_id: local {jobIdLocal}; remote {jobIdRemote}"); - if (jobIdLocal.Equals(jobIdRemote)) + try { - _log.Info("Latest Goldberg emulator is already available! Skipping..."); - return false; + _log.Info("Check if update is needed..."); + var jobIdLocal = Convert.ToInt32(File.ReadLines(jobIdPath).First().Trim()); + var jobIdRemote = Convert.ToInt32(match.Groups["jobid"].Value); + _log.Debug($"job_id: local {jobIdLocal}; remote {jobIdRemote}"); + if (jobIdLocal.Equals(jobIdRemote)) + { + _log.Info("Latest Goldberg emulator is already available! Skipping..."); + return false; + } + } + catch (Exception) + { + _log.Error("An error occured, local Goldberg setup might be broken!"); } } + _log.Info("Starting download..."); await StartDownload(match.Value).ConfigureAwait(false); return true; @@ -408,23 +426,44 @@ namespace GoldbergGUI.Core.Services // Extract all from archive to subfolder ./goldberg/ private async Task Extract(string archivePath) { + var errorOccured = false; _log.Debug("Start extraction..."); - await Task.Run(() => + Directory.Delete(_goldbergPath, true); + Directory.CreateDirectory(_goldbergPath); + using (var archive = await Task.Run(() => ZipFile.OpenRead(archivePath)).ConfigureAwait(false)) { - try + foreach (var entry in archive.Entries) { - Directory.Delete(_goldbergPath, true); - ZipFile.ExtractToDirectory(archivePath, _goldbergPath); + await Task.Run(() => + { + try + { + var fullPath = Path.Combine(_goldbergPath, entry.FullName); + if (string.IsNullOrEmpty(entry.Name)) + { + Directory.CreateDirectory(fullPath); + } + else + { + entry.ExtractToFile(fullPath, true); + } + } + catch (Exception e) + { + errorOccured = true; + _log.Error($"Error while trying to extract {entry.FullName}"); + _log.Error(e.ToString); + } + }).ConfigureAwait(false); } - catch (Exception e) - { - ShowErrorMessage(); - _log.Error(e.ToString); - Environment.Exit(1); - // throw; - } - }).ConfigureAwait(false); - _log.Debug("Extraction done!"); + } + + if (errorOccured) + { + ShowErrorMessage(); + _log.Warn("Error occured while extraction! Please setup Goldberg manually"); + } + _log.Info("Archive extracted successfully!"); } private void ShowErrorMessage() @@ -433,6 +472,7 @@ namespace GoldbergGUI.Core.Services { Directory.Delete(_goldbergPath, true); } + Directory.CreateDirectory(_goldbergPath); MessageBox.Show("Could not setup Goldberg Emulator!\n" + "Please download it manually and extract its content into the \"goldberg\" subfolder!"); From 373876c0743b4cde16e7a6aef75ad79115321ffa Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Wed, 7 Apr 2021 14:43:39 +0200 Subject: [PATCH 4/5] Downloaded Goldberg archive will now be validated by checking its file size. --- GoldbergGUI.Core/Services/GoldbergService.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/GoldbergGUI.Core/Services/GoldbergService.cs b/GoldbergGUI.Core/Services/GoldbergService.cs index a6f5617..6beb4bf 100644 --- a/GoldbergGUI.Core/Services/GoldbergService.cs +++ b/GoldbergGUI.Core/Services/GoldbergService.cs @@ -407,11 +407,24 @@ namespace GoldbergGUI.Core.Services _log.Debug(downloadUrl); await using var fileStream = File.OpenWrite(_goldbergZipPath); //client.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead) + var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, downloadUrl); + var headResponse = await client.SendAsync(httpRequestMessage).ConfigureAwait(false); + var contentLength = headResponse.Content.Headers.ContentLength; var task = client.GetFileAsync(downloadUrl, fileStream).ConfigureAwait(false); await task; if (task.GetAwaiter().IsCompleted) { - _log.Info("Download finished!"); + await fileStream.DisposeAsync().ConfigureAwait(false); + var fileLength = new FileInfo(_goldbergZipPath).Length; + // Environment.Exit(128); + if (contentLength == fileLength) + { + _log.Info("Download finished!"); + } + else + { + throw new Exception("File size does not match!"); + } } } catch (Exception e) @@ -463,7 +476,7 @@ namespace GoldbergGUI.Core.Services ShowErrorMessage(); _log.Warn("Error occured while extraction! Please setup Goldberg manually"); } - _log.Info("Archive extracted successfully!"); + _log.Info("Extraction was successful!"); } private void ShowErrorMessage() From e4dfd38dd355faccbbd6ec7d92db8be7555206aa Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Wed, 7 Apr 2021 14:51:49 +0200 Subject: [PATCH 5/5] Improved log verbosity. --- GoldbergGUI.Core/Services/GoldbergService.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/GoldbergGUI.Core/Services/GoldbergService.cs b/GoldbergGUI.Core/Services/GoldbergService.cs index 6beb4bf..7ae2c3c 100644 --- a/GoldbergGUI.Core/Services/GoldbergService.cs +++ b/GoldbergGUI.Core/Services/GoldbergService.cs @@ -113,7 +113,8 @@ namespace GoldbergGUI.Core.Services !long.TryParse(File.ReadLines(_userSteamIdPath).First().Trim(), out steamId) && steamId < 76561197960265729 && steamId > 76561202255233023) { - _log.Error("Invalid User Steam ID!"); + _log.Error("Invalid User Steam ID! Using default Steam ID..."); + steamId = DefaultSteamId; } if (File.Exists(_languagePath)) language = File.ReadLines(_languagePath).First().Trim(); @@ -121,6 +122,7 @@ namespace GoldbergGUI.Core.Services customBroadcastIps.AddRange( File.ReadLines(_customBroadcastIpsPath).Select(line => line.Trim())); }).ConfigureAwait(false); + _log.Info("Got global settings."); return new GoldbergGlobalConfiguration { AccountName = accountName, @@ -200,6 +202,7 @@ namespace GoldbergGUI.Core.Services _log.Info("Empty list of custom broadcast IPs! Skipping..."); await Task.Run(() => File.Delete(_customBroadcastIpsPath)).ConfigureAwait(false); } + _log.Info("Setting global configuration finished."); } // If first time, call GenerateInterfaces @@ -410,9 +413,7 @@ namespace GoldbergGUI.Core.Services var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, downloadUrl); var headResponse = await client.SendAsync(httpRequestMessage).ConfigureAwait(false); var contentLength = headResponse.Content.Headers.ContentLength; - var task = client.GetFileAsync(downloadUrl, fileStream).ConfigureAwait(false); - await task; - if (task.GetAwaiter().IsCompleted) + await client.GetFileAsync(downloadUrl, fileStream).ContinueWith(async t => { await fileStream.DisposeAsync().ConfigureAwait(false); var fileLength = new FileInfo(_goldbergZipPath).Length; @@ -425,7 +426,7 @@ namespace GoldbergGUI.Core.Services { throw new Exception("File size does not match!"); } - } + }).ConfigureAwait(false); } catch (Exception e) {