Added more robust app version class

Author: yoshiask

ZuneModdingHelper/App.xaml.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Windows;
+using System.Windows;
 using Microsoft.AppCenter;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.AppCenter.Crashes;
@@ -13,9 +12,8 @@ public partial class App : Application
     {
         public const string Title = "Zune Modding Helper";
 
-        public static readonly Version VersionNum = new(2021, 10, 23, 0);
-        public const string VersionStatus = "alpha";
-        public static readonly string Version = VersionNum.ToString() + (VersionStatus != string.Empty ? "-" + VersionStatus : string.Empty);
+        public static readonly ReleaseVersion Version = new(2021, 11, 14, 0, Phase.Alpha);
+        public static readonly string VersionStr = Version.ToString();
 
         public const string DonateLink = "https://www.paypal.me/YoshiAsk";
 
@@ -40,17 +38,5 @@ public static void OpenInBrowser(string url)
                 UseShellExecute = true
             });
         }
-
-        public static bool CheckIfNewerVersion(string otherStr)
-        {
-            int idxSplit = otherStr.IndexOf('-');
-            Version otherNum = new(otherStr[..idxSplit]);
-            string otherStatus = otherStr[(idxSplit + 1)..];
-
-            // TODO: This assumes that the VersionStatus is "alpha"
-            bool isNotAlpha = otherStatus != VersionStatus;
-            bool isNewer = otherNum > VersionNum;
-            return isNotAlpha || isNewer;
-        }
     }
 }

ZuneModdingHelper/MainWindow.xaml

@@ -34,7 +34,7 @@
                 </mah:Flyout.Header>
                 <TextBlock FontSize="14" Padding="16" TextWrapping="Wrap">
                     <Run Text="{x:Static local:App.Title}" FontWeight="Bold" FontSize="16"/><LineBreak/>
-                    <Run Text="{x:Static local:App.Version}"/><LineBreak/>
+                    <Run Text="{x:Static local:App.VersionStr}"/><LineBreak/>
                     <Hyperlink NavigateUri="https://github.com/ZuneDev/ZuneModdingHelper" RequestNavigate="Link_RequestNavigate">
                         <Run Text="View source"/>
                     </Hyperlink><LineBreak/>

ZuneModdingHelper/MainWindow.xaml.cs

@@ -6,6 +6,7 @@
 using Microsoft.WindowsAPICodePack.Dialogs;
 using Newtonsoft.Json.Linq;
 using OwlCore.AbstractUI.Models;
+using Syroot.Windows.IO;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -166,10 +167,11 @@ private async void UpdatesButton_Click(object sender, RoutedEventArgs e)
             {
                 // Get releases list from GitHub
                 List<JObject> releases = await "https://api.github.com/repos/ZuneDev/ZuneModdingHelper/releases"
-                    .WithHeader("User-Agent", App.Title.Replace(" ", "") + "/" + App.Version)
+                    .WithHeader("User-Agent", App.Title.Replace(" ", "") + "/" + App.VersionStr)
                     .GetJsonAsync<List<JObject>>();
                 JObject latest = releases[0];
-                if (!App.CheckIfNewerVersion(latest["tag_name"].Value<string>()))
+                string latestVerStr = latest["tag_name"].Value<string>();
+                if (!ReleaseVersion.TryParse(latestVerStr, out var latestVer) || App.Version >= latestVer)
                 {
                     // Already up-to-date
 
@@ -192,7 +194,7 @@ private async void UpdatesButton_Click(object sender, RoutedEventArgs e)
                     NegativeButtonText = "Later"
                 };
                 await checkDialog.CloseAsync();
-                var promptResult = await this.ShowMessageAsync("Update available", $"Relase {latest["name"]} is available. Would you like to download it now?",
+                var promptResult = await this.ShowMessageAsync("Update available", $"Release {latest["name"]} is available. Would you like to download it now?",
                     MessageDialogStyle.AffirmativeAndNegative, promptSettings);
                 bool acceptedUpdate = promptResult == MessageDialogResult.Affirmative;
 
@@ -221,7 +223,8 @@ private async void UpdatesButton_Click(object sender, RoutedEventArgs e)
                     // Ask user to save file
                     Microsoft.Win32.SaveFileDialog saveFileDialog = new()
                     {
-                        FileName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads", assetName)
+                        FileName = assetName,
+                        InitialDirectory = new KnownFolder(KnownFolderType.Downloads).Path
                     };
                     bool dialogResult = saveFileDialog.ShowDialog() ?? false;
                     await progDialog.CloseAsync();
@@ -240,6 +243,9 @@ private async void UpdatesButton_Click(object sender, RoutedEventArgs e)
             catch
             {
                 App.OpenInBrowser("https://github.com/ZuneDev/ZuneModdingHelper/releases");
+            }
+            finally
+            {
                 if (checkDialog.IsOpen)
                     await checkDialog.CloseAsync();
             }
@@ -266,7 +272,7 @@ private void LocateZuneButton_Click(object sender, RoutedEventArgs e)
             {
                 // TODO: Fallback to pre-Vista dialog
                 this.ShowMessageAsync("Error",
-                    "Please use File Explorer to locate an copy the path.",
+                    "Please use File Explorer to locate and copy the path.",
                     settings: defaultMetroDialogSettings);
             }
         }