Fix launcher updater crashing after canceling download

imesense · Jun 17, 2024 · a962832 · a962832
1 parent 2122183
commit a962832
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/ImeSense.Launchers.Belarus.Core/Services/UpdaterService.cs b/src/ImeSense.Launchers.Belarus.Core/Services/UpdaterService.cs
@@ -15,6 +15,8 @@ public class UpdaterService(ILogger<UpdaterService> logger, IGitStorageApiServic
 
     public async Task UpdaterAsync(Uri uri, string fileSavePath, CancellationToken cancellationToken = default)
     {
+        CleanUpTempFiles(); // Delete files if user canceled download
+
         var fileName = Path.GetFileNameWithoutExtension(fileSavePath);
         var fullFileName = Path.GetFileName(fileSavePath);
 

diff --git a/src/ImeSense.Launchers.Belarus.Updater/Program.cs b/src/ImeSense.Launchers.Belarus.Updater/Program.cs
@@ -35,10 +35,11 @@
     httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github.v3+json"));
     httpClient.DefaultRequestHeaders.Add("User-Agent", ".NET Foundation Repository Reporter");
 
+    var cancellationToken = new CancellationTokenSource();
     var updaterService = new UpdaterService(factory.CreateLogger<UpdaterService>(),
         new GitHubApiService(factory.CreateLogger<GitHubApiService>(), httpClient, null),
         new FileDownloadManager(factory.CreateLogger<FileDownloadManager>(), httpClient));
-    await updaterService.UpdaterAsync(UriStorage.LauncherApiUri, fileSavePath);
+    await updaterService.UpdaterAsync(UriStorage.LauncherApiUri, fileSavePath, cancellationToken.Token);
 
     logger.LogInformation($"Finish!");
     Launcher.Launch(Path.Combine(DirectoryStorage.Base, FileNameStorage.SBLauncher))?.Start();