Merge remote-tracking branch 'upstream/master' into master-upstream

dragonfruitnetwork · Nov 13, 2024 · 8fa8297 · 8fa8297
2 parents fc2900e + c5f9490
commit 8fa8297
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -77,6 +77,8 @@ jobs:
       - name: Validate Deployment Tool Attestation
         working-directory: ${{ steps.deploytool.outputs.home }}
         run: gh attestation verify DragonFruit.OnionFruit.Deploy.dll --repo dragonfruitnetwork/onionfruit-deploy --deny-self-hosted-runners
+        env:
+          GH_TOKEN: ${{ github.token }}
 
       - name: Restore .NET Tools
         run: dotnet tool restore

diff --git a/DragonFruit.OnionFruit/App.axaml.cs b/DragonFruit.OnionFruit/App.axaml.cs
@@ -22,6 +22,7 @@
 using LucideAvalonia.Enum;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Nito.AsyncEx;
 using ReactiveUI;
 
@@ -254,7 +255,15 @@ public static bool Launch(string url)
             UseShellExecute = true
         };
 
-        return Process.Start(psi) != null;
+        try
+        {
+            return Process.Start(psi) != null;
+        }
+        catch (Exception e)
+        {
+            Instance.Services.GetRequiredService<ILogger<App>>().LogWarning(e, "Failed to launch URL due to an error: {err}", e.Message);
+            return false;
+        }
     }
 
     public static IconSource GetIcon(LucideIconNames icon, IImmutableSolidColorBrush brush = null, double thickness = 1.5)

diff --git a/DragonFruit.OnionFruit/Updater/VelopackUpdater.cs b/DragonFruit.OnionFruit/Updater/VelopackUpdater.cs
@@ -89,7 +89,7 @@ private async Task PerformUpdateCheckInternal()
             }
             catch (Exception e)
             {
-                _logger.LogError(e, "Failed to perform updater: {message}", e.Message);
+                _logger.LogError(e, "Failed to perform update: {message}", e.Message);
                 Status = OnionFruitUpdaterStatus.Failed;
             }
         }

diff --git a/DragonFruit.OnionFruit/ViewModels/AboutPageTabViewModel.cs b/DragonFruit.OnionFruit/ViewModels/AboutPageTabViewModel.cs
@@ -51,10 +51,10 @@ public AboutPageTabViewModel(IOnionFruitUpdater updater, ILogger<AboutPageTabVie
                 {
                     OnionFruitUpdaterStatus.Checking => "Checking for updates...",
 
-                    OnionFruitUpdaterStatus.Downloading when x.Second.HasValue => $"Downloading update ({x.Second}%)",
+                    OnionFruitUpdaterStatus.Downloading when x.Second.HasValue => $"Downloading ({x.Second}%)",
                     OnionFruitUpdaterStatus.Failed when x.Second.HasValue => "Update failed",
 
-                    OnionFruitUpdaterStatus.Downloading => "Downloading update...",
+                    OnionFruitUpdaterStatus.Downloading => "Downloading...",
                     OnionFruitUpdaterStatus.Failed => "Update check failed",
 
                     OnionFruitUpdaterStatus.UpToDate => "No updates available",

diff --git a/DragonFruit.OnionFruit/ViewModels/MainWindowViewModel.cs b/DragonFruit.OnionFruit/ViewModels/MainWindowViewModel.cs
@@ -225,10 +225,10 @@ private static IEnumerable<TorNodeCountry> ProcessCountries(EventPattern<IReadOn
 
         private static string GetWindowTitle((OnionFruitUpdaterStatus Status, int? Progress) current) => current.Status switch
         {
-            OnionFruitUpdaterStatus.Downloading when current.Progress.HasValue => $"{App.Title} - Downloading update ({current.Progress}%)",
-            OnionFruitUpdaterStatus.Downloading => $"{App.Title} - Downloading update",
-            OnionFruitUpdaterStatus.PendingRestart => $"{App.Title} - Update downloaded (pending restart)",
-            OnionFruitUpdaterStatus.Failed => $"{App.Title} - Update failed",
+            OnionFruitUpdaterStatus.Downloading when current.Progress.HasValue => $"{App.Title} - Downloading Update ({current.Progress}%)",
+            OnionFruitUpdaterStatus.Downloading => $"{App.Title} - Downloading Update",
+            OnionFruitUpdaterStatus.PendingRestart => $"{App.Title} - Update Downloaded",
+            OnionFruitUpdaterStatus.Failed => $"{App.Title} - Update Failed",
 
             _ => App.Title
         };