Skip to content

feat: upgrading update package #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025
+25 −7
Merged

feat: upgrading update package #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions src/Nullinside.Api.Common/Desktop/GitHubUpdateManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static async Task PrepareUpdate() {
// To prepare the update, we just need to back up our files
string ourFolder = Path.GetDirectoryName(typeof(GitHubUpdateManager).Assembly.Location) ?? "";
string backupFolder = Path.Combine(ourFolder, "..", "backup");
await DeleteRetry(backupFolder);
await DeleteFolderRetry(backupFolder);

Directory.CreateDirectory(backupFolder);
FileSystem.CopyDirectory(ourFolder, backupFolder);
Expand Down Expand Up @@ -78,7 +78,7 @@ public static void ExitApplicationToUpdate() {
/// </summary>
public static async Task PerformUpdateAndRestart(string owner, string repo, string installFolder, string assetName) {
// Delete the old install folder.
await DeleteRetry(installFolder);
await DeleteFolderContentsRetry(installFolder);

// Get the latest version of the application from GitHub.
string ourFolder = Path.GetDirectoryName(typeof(GitHubUpdateManager).Assembly.Location) ?? "";
Expand All @@ -96,7 +96,7 @@ public static async Task PerformUpdateAndRestart(string owner, string repo, stri

// Run the new version of the application.
Process.Start(Path.Combine(installFolder, $"{AppDomain.CurrentDomain.FriendlyName}.exe"), "--justUpdated");

// Close this version of the application.
Environment.Exit(0);
}
Expand All @@ -108,20 +108,38 @@ public static async Task CleanupUpdate() {
string ourFolder = Path.GetDirectoryName(typeof(GitHubUpdateManager).Assembly.Location) ?? "";
string backupFolder = Path.Combine(ourFolder, "..", "backup");

await DeleteRetry(backupFolder);
await DeleteFolderRetry(backupFolder);
}

/// <summary>
/// Retries deleting a folder multiple times.
/// Retries deleting a folder multiple times.
/// </summary>
/// <param name="folder">The folder to delete.</param>
private static async Task DeleteRetry(string folder) {
await Retry.Execute<bool>(() => {
private static async Task DeleteFolderRetry(string folder) {
await Retry.Execute(() => {
if (Directory.Exists(folder)) {
Directory.Delete(folder, true);
}

return Task.FromResult(true);
}, 30, waitTime: TimeSpan.FromSeconds(1));
}

/// <summary>
/// Retries deleting the contents of a folder multiple times.
/// </summary>
/// <param name="folder">The folder to delete the contents of.</param>
private static async Task DeleteFolderContentsRetry(string folder) {
await Retry.Execute(() => {
if (!Directory.Exists(folder)) {
return Task.FromResult(true);
}

foreach (string file in Directory.GetFiles(folder)) {
File.Delete(file);
}

return Task.FromResult(true);
}, 30, waitTime: TimeSpan.FromSeconds(1));
}
}