From 3adcbd9ee5f99ccfa5270c193a4bafbd54ef50cd Mon Sep 17 00:00:00 2001 From: Gregoire Pailler Date: Mon, 13 Mar 2017 12:00:55 +0800 Subject: [PATCH 1/2] - Raise a 100% progression when download is completed - Raise a 0% progression when ApplReleases is started --- src/Squirrel/FileDownloader.cs | 8 +++++++- src/Squirrel/UpdateManager.ApplyReleases.cs | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Squirrel/FileDownloader.cs b/src/Squirrel/FileDownloader.cs index 78e2996c..89a6c531 100644 --- a/src/Squirrel/FileDownloader.cs +++ b/src/Squirrel/FileDownloader.cs @@ -39,7 +39,13 @@ namespace Squirrel try { this.Log().Info("Downloading file: " + (failedUrl ?? url)); - await this.WarnIfThrows(() => wc.DownloadFileTaskAsync(failedUrl ?? url, targetFile), + await this.WarnIfThrows( + async () => + { + await wc.DownloadFileTaskAsync(failedUrl ?? url, targetFile); + progress(100); + } + , "Failed downloading URL: " + (failedUrl ?? url)); } catch (Exception) { // NB: Some super brain-dead services are case-sensitive yet diff --git a/src/Squirrel/UpdateManager.ApplyReleases.cs b/src/Squirrel/UpdateManager.ApplyReleases.cs index f35a7786..456dc154 100644 --- a/src/Squirrel/UpdateManager.ApplyReleases.cs +++ b/src/Squirrel/UpdateManager.ApplyReleases.cs @@ -33,6 +33,7 @@ namespace Squirrel { progress = progress ?? (_ => { }); + progress(0); var release = await createFullPackagesFromDeltas(updateInfo.ReleasesToApply, updateInfo.CurrentlyInstalledVersion); progress(10); From 9562bae06d6f6680c2a5e749c117651b995e90f5 Mon Sep 17 00:00:00 2001 From: Gregoire Pailler Date: Tue, 2 May 2017 09:49:21 +0800 Subject: [PATCH 2/2] Fixed indentation to match code guidelines --- src/Squirrel/FileDownloader.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Squirrel/FileDownloader.cs b/src/Squirrel/FileDownloader.cs index 89a6c531..355df451 100644 --- a/src/Squirrel/FileDownloader.cs +++ b/src/Squirrel/FileDownloader.cs @@ -40,12 +40,10 @@ namespace Squirrel this.Log().Info("Downloading file: " + (failedUrl ?? url)); await this.WarnIfThrows( - async () => - { - await wc.DownloadFileTaskAsync(failedUrl ?? url, targetFile); - progress(100); - } - , + async () => { + await wc.DownloadFileTaskAsync(failedUrl ?? url, targetFile); + progress(100); + }, "Failed downloading URL: " + (failedUrl ?? url)); } catch (Exception) { // NB: Some super brain-dead services are case-sensitive yet