Cleanup (#128)

* remove dispatcher

* Cleanup

* revert

* Formatting

* remove using

Author: amirburbea

KoAR.SaveEditor/Updates/UpdateMethods.cs

@@ -27,7 +27,7 @@ public static class UpdateMethods
     public static async void ExecuteUpdate(string zipFilePath)
     {
         string scriptFileName = await UpdateMethods.ExtractPowershellScript().ConfigureAwait(false);
-        using Process process = Process.Start(new ProcessStartInfo
+        using Process process = Process.Start(startInfo: new()
         {
             WorkingDirectory = Path.GetTempPath(),
             UseShellExecute = false,
@@ -44,7 +44,7 @@ public static async void ExecuteUpdate(string zipFilePath)
     /// <param name="majorVersion">The major version of the release.</param>
     /// <param name="cancellationToken">Optionally used to propagate cancellation requests.</param>
     /// <returns>Information related to a release. Returns <see langword="null"/> if not found or an error occurs.</returns>
-    public static async Task<IReleaseInfo?> FetchLatestVersionedRelease(int majorVersion, CancellationToken cancellationToken = default)
+    public static async Task<IReleaseInfo?> FetchLatestVersionedReleaseAsync(int majorVersion, CancellationToken cancellationToken = default)
     {
         try
         {
@@ -66,14 +66,6 @@ public static async void ExecuteUpdate(string zipFilePath)
         return default;
     }
 
-    /// <summary>
-    /// Fetches the latest 2.x release.
-    /// </summary>
-    /// <param name="cancellationToken">Optionally used to propagate cancellation requests.</param>
-    /// <returns>Information related to a release. Returns <see langword="null"/> if not found or an error occurs.</returns>
-    public static Task<IReleaseInfo?> FetchLatest2xReleaseAsync(CancellationToken cancellationToken = default) =>
-        UpdateMethods.FetchLatestVersionedRelease(2, cancellationToken);
-
     /// <summary>
     /// Fetches an array of the interim update releases for the current major version of the application to the latest.
     /// Only checks up to <paramref name="maxReleases"/> number of tags/releases.
@@ -116,8 +108,8 @@ private static async Task<string> ExtractPowershellScript()
     {
         try
         {
-            return await UpdateMethods._client.GetFromJsonAsync<T>($"https://api.github.com/repos/mburbea/koar-item-editor/{suffix}", UpdateMethods._jsonOptions, cancellationToken)
-                .ConfigureAwait(false);
+            string uri = $"https://api.github.com/repos/mburbea/koar-item-editor/{suffix}";
+            return await UpdateMethods._client.GetFromJsonAsync<T>(uri, UpdateMethods._jsonOptions, cancellationToken).ConfigureAwait(false);
         }
         catch (HttpRequestException e) when (e.StatusCode == HttpStatusCode.NotFound)
         {
@@ -169,7 +161,7 @@ private sealed class Release : IReleaseInfo
 
         public Version Version => this._version ??= new(this.TagName.Length != 0 ? this.TagName[1..] : "0.0.0");
 
-        public ReleaseAsset? ZipFileAsset => this._zipFileAsset ??= this.Assets.FirstOrDefault(asset => asset.IsZipFile);
+        public ReleaseAsset? ZipFileAsset => this._zipFileAsset ??= this.Assets.FirstOrDefault(asset => asset.ContentType == "application/zip");
 
         public int ZipFileSize => this.ZipFileAsset?.Size ?? 0;
 
@@ -182,8 +174,6 @@ private sealed class ReleaseAsset
 
         public string ContentType { get; set; } = string.Empty;
 
-        public bool IsZipFile => this.ContentType == "application/zip";
-
         public int Size { get; set; }
     }
 

KoAR.SaveEditor/Views/Main/MainWindow.xaml.cs

@@ -67,7 +67,7 @@ 1. Your saves are usually not in the same folder as the game. The editor attemps
         IReleaseInfo? release = default;
         try
         {
-            if ((release = await UpdateMethods.FetchLatest2xReleaseAsync(source.Token)) != null)
+            if ((release = await UpdateMethods.FetchLatestVersionedReleaseAsync(2, source.Token)) != null)
             {
                 using OriginalUpdateViewModel viewModel = new(release);
                 UpdateWindow window = new() { DataContext = viewModel, Owner = this };

KoAR.SaveEditor/Views/Main/MainWindowViewModel.cs

@@ -5,7 +5,6 @@
 using System.Threading;
 using System.Windows.Forms;
 using System.Windows.Interop;
-using System.Windows.Threading;
 using KoAR.Core;
 using KoAR.SaveEditor.Constructs;
 using KoAR.SaveEditor.Properties;
@@ -19,7 +18,6 @@ namespace KoAR.SaveEditor.Views.Main;
 
 public sealed class MainWindowViewModel : NotifierBase
 {
-    private readonly Dispatcher _dispatcher = Dispatcher.CurrentDispatcher;
     private bool _hasUnsavedChanges;
     private InventoryManagerViewModel? _inventoryManager;
     private bool _isCheckingForUpdate;

KoAR.SaveEditor/Views/Updates/UpdateControl.xaml.cs

@@ -49,7 +49,7 @@ private void ViewModel_DialogResultChanged(object? sender, PropertyChangedEventA
 
     private void Window_Closing(object? sender, CancelEventArgs e)
     {
-        ((Window)sender!).Closing -= Window_Closing;
+        ((Window)sender!).Closing -= this.Window_Closing;
         UpdateViewModelBase viewModel = (UpdateViewModelBase)this.DataContext;
         PropertyChangedEventManager.RemoveHandler(viewModel, this.ViewModel_DialogResultChanged, nameof(viewModel.DialogResult));
     }

KoAR.SaveEditor/Views/Updates/UpdateViewModelBase.cs

@@ -111,10 +111,10 @@ private static FlowDocument CreateDocument(IEnumerable<IReleaseInfo> releases)
             section.Blocks.Add(new Paragraph
             {
                 Inlines =
-                    {
-                        new Run($"{release.Name}{Environment.NewLine}Released:") { FontWeight = FontWeights.SemiBold },
-                        new Run($" {GetDescriptiveText(DateTime.UtcNow - release.PublishedAt)} ago."),
-                    }
+                {
+                    new Run($"{release.Name}{Environment.NewLine}Released:") { FontWeight = FontWeights.SemiBold },
+                    new Run($" {GetDescriptiveText(DateTime.UtcNow - release.PublishedAt)} ago."),
+                }
             });
             section.Blocks.AddRange(engine.Transform(release.Body).Blocks.ToList());
             document.Blocks.Add(section);