From 84342cf6045123671fc3ed8ea2479b2fe711ebf0 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Thu, 11 Mar 2021 15:51:35 -0700 Subject: [PATCH] 2.4.2.7 --- CHANGELOG.md | 6 ++++++ Wabbajack.CLI/Wabbajack.CLI.csproj | 4 ++-- Wabbajack.Launcher/MainWindowVM.cs | 18 ++---------------- Wabbajack.Launcher/Wabbajack.Launcher.csproj | 4 ++-- Wabbajack.Lib/LauncherUpdater.cs | 3 ++- Wabbajack.Server/Wabbajack.Server.csproj | 4 ++-- Wabbajack/Wabbajack.csproj | 4 ++-- 7 files changed, 18 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31563f9e..53ec7938 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ### Changelog +#### Version - 2.4.5.7 - 3/11/2021 +* Several fixes for working off the new CDN +* Better detect failures in the launcher +* The app now cleans up older versions (leaving a total of 2 previous versions) +* The app now updates the launcher + #### Version - 2.4.2.6 - 2/26/2021 * Cache Modlist images (based on the URL) * Load Gallery images off the GUI thread improving UI performance diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index f69b6cf0..2a905025 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.4.2.6 - 2.4.2.6 + 2.4.2.7 + 2.4.2.7 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.Launcher/MainWindowVM.cs b/Wabbajack.Launcher/MainWindowVM.cs index c632e95c..1b5ce24c 100644 --- a/Wabbajack.Launcher/MainWindowVM.cs +++ b/Wabbajack.Launcher/MainWindowVM.cs @@ -97,7 +97,7 @@ namespace Wabbajack.Launcher byte[] data; try { - data = await wc.DownloadDataTaskAsync(asset.BrowserDownloadUrlFast); + data = await wc.DownloadDataTaskAsync(asset.BrowserDownloadUrl); } catch (Exception ex) { @@ -209,21 +209,7 @@ namespace Wabbajack.Launcher { [JsonProperty("browser_download_url")] public Uri BrowserDownloadUrl { get; set; } - - [JsonIgnore] - public Uri BrowserDownloadUrlFast { - get - { - if (BrowserDownloadUrl.ToString() - .StartsWith("https://github.com/wabbajack-tools/wabbajack/releases/")) - return new Uri(BrowserDownloadUrl.ToString() - .Replace("https://github.com/wabbajack-tools/wabbajack/releases/", - "https://releases.wabbajack.org/")); - return BrowserDownloadUrl; - } - } - - + [JsonProperty("name")] public string Name { get; set; } } diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 29fe9b7e..edf7e037 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ Exe net5.0-windows true - 2.4.2.6 - 2.4.2.6 + 2.4.2.7 + 2.4.2.7 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Lib/LauncherUpdater.cs b/Wabbajack.Lib/LauncherUpdater.cs index 15ad6eb6..4c2503f9 100644 --- a/Wabbajack.Lib/LauncherUpdater.cs +++ b/Wabbajack.Lib/LauncherUpdater.cs @@ -63,7 +63,7 @@ namespace Wabbajack.Lib if (release != default && launcherVersion != null && release.version > Version.Parse(launcherVersion.FileVersion!)) { - Utils.Log($"Updating Launcher from {launcherVersion} to {release.version}"); + Utils.Log($"Updating Launcher from {launcherVersion.FileVersion} to {release.version}"); var tempPath = launcherFolder.Combine("Wabbajack.exe.temp"); var client = new Client(); client.UseChromeUserAgent(); @@ -81,6 +81,7 @@ namespace Wabbajack.Lib await tempPath.MoveToAsync(exePath); Utils.Log("Finished updating wabbajack"); + await Metrics.Send("updated_launcher", $"{launcherVersion.FileVersion} -> {release.version}"); } } diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index fa97c8a5..862c8a3a 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe net5.0-windows - 2.4.2.5 - 2.4.2.5 + 2.4.2.7 + 2.4.2.7 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index 9ba550f3..8a16ef49 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.4.2.6 - 2.4.2.6 + 2.4.2.7 + 2.4.2.7 Copyright © 2019-2020 An automated ModList installer true