Switch to Octokit

ZuneModdingHelper/App.xaml.cs

@@ -46,6 +46,10 @@ namespace ZuneModdingHelper
         private static void ConfigureServices()
         {
             ServiceCollection services = new();
+
+            Octokit.IGitHubClient github = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(Title.Replace(" ", ""), VersionStr));
+            services.AddSingleton(github);
+
             Ioc.Default.ConfigureServices(services.BuildServiceProvider());
         }
     }

ZuneModdingHelper/MainWindow.xaml.cs

@@ -1,10 +1,10 @@
-using ControlzEx.Theming;
-using Flurl.Http;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using ControlzEx.Theming;
 using MahApps.Metro.Controls;
 using MahApps.Metro.Controls.Dialogs;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.WindowsAPICodePack.Dialogs;
-using Newtonsoft.Json.Linq;
+using Octokit;
 using OwlCore.AbstractUI.Models;
 using Syroot.Windows.IO;
 using System;
@@ -31,6 +31,8 @@ namespace ZuneModdingHelper
             AffirmativeButtonText = "OK"
         };
 
+        private readonly IGitHubClient? _gitHub = Ioc.Default.GetService<IGitHubClient>();
+
         public MainWindow()
         {
             InitializeComponent();
@@ -179,21 +181,26 @@ namespace ZuneModdingHelper
 
         private async void UpdatesButton_Click(object sender, RoutedEventArgs e)
         {
+            if (_gitHub is null)
+                return;
+
             var checkDialog = await this.ShowProgressAsync("Checking for updates...", "Please wait.", settings: defaultMetroDialogSettings);
             checkDialog.SetIndeterminate();
 
             try
             {
                 // Get releases list from GitHub
-                List<JObject> releases = await "https://api.github.com/repos/ZuneDev/ZuneModdingHelper/releases"
-                    .WithHeader("User-Agent", App.Title.Replace(" ", "") + "/" + App.VersionStr)
-                    .GetJsonAsync<List<JObject>>();
-                JObject latest = releases[0];
-                string latestVerStr = latest["tag_name"].Value<string>();
-                if (!ReleaseVersion.TryParse(latestVerStr, out var latestVer) || App.Version >= latestVer)
+                // Why not use the `releases/latest` endpoint? Good question: https://github.com/octokit/octokit.net/issues/2916
+                var releases = await _gitHub.Repository.Release.GetAll("ZuneDev", "ZuneModdingHelper");
+                var latest = releases
+                    .Select(r => new { Release = r, Version = ReleaseVersion.Parse(r.TagName) })
+                    .OrderByDescending(t => t.Version)
+                    .ThenBy(t => t.Release.Prerelease)
+                    .First();
+
+                if (!ReleaseVersion.TryParse(latest.Release.TagName, out var latestVer) || App.Version >= latestVer)
                 {
                     // Already up-to-date
-
                     Analytics.TrackEvent("Checked for updates", new Dictionary<string, string> {
                         { "UpdatesFound", bool.FalseString },
                     });
@@ -213,7 +220,7 @@ namespace ZuneModdingHelper
                     NegativeButtonText = "Later"
                 };
                 await checkDialog.CloseAsync();
-                var promptResult = await this.ShowMessageAsync("Update available", $"Release {latest["name"]} is available. Would you like to download it now?",
+                var promptResult = await this.ShowMessageAsync("Update available", $"Release {latest.Release.Name} is available. Would you like to download it now?",
                     MessageDialogStyle.AffirmativeAndNegative, promptSettings);
                 bool acceptedUpdate = promptResult == MessageDialogResult.Affirmative;
 
@@ -224,9 +231,8 @@ namespace ZuneModdingHelper
                     progDialog.SetIndeterminate();
 
                     // Download new version to AppData
-                    JObject asset = latest["assets"].ToObject<List<JObject>>()[0];
-                    string assetName = asset["name"].Value<string>();
-                    string downloadedFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), assetName);
+                    var asset = latest.Release.Assets[0];
+                    string downloadedFile = Path.Combine(Path.GetTempPath(), asset.Name);
                     if (File.Exists(downloadedFile)) File.Delete(downloadedFile);
                     using (var client = new System.Net.WebClient())
                     {
@@ -236,13 +242,13 @@ namespace ZuneModdingHelper
                         };
 
                         progDialog.SetProgress(0);
-                        await client.DownloadFileTaskAsync(new Uri(asset["browser_download_url"].Value<string>()), downloadedFile);
+                        await client.DownloadFileTaskAsync(new Uri(asset.BrowserDownloadUrl), downloadedFile);
                     }
 
                     // Ask user to save file
                     Microsoft.Win32.SaveFileDialog saveFileDialog = new()
                     {
-                        FileName = assetName,
+                        FileName = asset.Name,
                         InitialDirectory = new KnownFolder(KnownFolderType.Downloads).Path
                     };
                     bool dialogResult = saveFileDialog.ShowDialog() ?? false;
@@ -252,6 +258,8 @@ namespace ZuneModdingHelper
                         File.Copy(downloadedFile, saveFileDialog.FileName, true);
                         await this.ShowMessageAsync("Update complete", "You may now exit this program and open the new version.", settings: defaultMetroDialogSettings);
                     }
+
+                    File.Delete(downloadedFile);
                 }
 
                 Analytics.TrackEvent("Checked for updates", new Dictionary<string, string> {

ZuneModdingHelper/ZuneModdingHelper.csproj

@@ -1,39 +1,39 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
         <TargetFramework>net8.0-windows</TargetFramework>
-		<UseWPF>true</UseWPF>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<Version>2021.12.30.0</Version>
-		<Authors>Joshua "Yoshi" Askharoun</Authors>
-		<RepositoryUrl>https://github.com/ZuneDev/ZuneModdingHelper</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
-		<Platforms>x64;x86</Platforms>
-		<LangVersion>latest</LangVersion>
-		<ApplicationIcon>Assets\ZMH_Icon.ico</ApplicationIcon>
-	</PropertyGroup>
+        <UseWPF>true</UseWPF>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <Version>2021.12.30.0</Version>
+        <Authors>Joshua "Yoshi" Askharoun</Authors>
+        <RepositoryUrl>https://github.com/ZuneDev/ZuneModdingHelper</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <Platforms>x64;x86</Platforms>
+        <LangVersion>latest</LangVersion>
+        <ApplicationIcon>Assets\ZMH_Icon.ico</ApplicationIcon>
+    </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\OwlCore.Wpf\OwlCore.Wpf.csproj" />
-		<ProjectReference Include="..\ZuneModCore\ZuneModCore.csproj" />
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\OwlCore.Wpf\OwlCore.Wpf.csproj" />
+        <ProjectReference Include="..\ZuneModCore\ZuneModCore.csproj" />
+    </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Flurl.Http" Version="4.0.2" />
-		<PackageReference Include="MahApps.Metro" Version="2.4.10" />
-		<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
-		<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
-		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
-		<PackageReference Include="OwlCore" Version="0.4.1" />
-		<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
-		<PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.3.0" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="MahApps.Metro" Version="2.4.10" />
+        <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
+        <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
+        <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+        <PackageReference Include="Octokit" Version="11.0.1" />
+        <PackageReference Include="OwlCore" Version="0.4.1" />
+        <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
+        <PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.3.0" />
+    </ItemGroup>
 
-	<ItemGroup>
-	  <Resource Include="Assets\ZMH_Icons.ttf">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Resource>
-	</ItemGroup>
+    <ItemGroup>
+        <Resource Include="Assets\ZMH_Icons.ttf">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Resource>
+    </ItemGroup>
 
 </Project>