Merge pull request #2836 from wabbajack-tools/4.0.4.0

4.0.4.0

Author: tr4wzified

CHANGELOG.md

@@ -1,11 +1,18 @@
 ### Changelog
 
+#### Version - 4.0.4.0
+* Fixed the Nexus OAuth token never being refreshed upon starting installation or during downloads
+  * This could lead to issues after having not logged back into Nexus for 6 hours after your initial login
+* Fixed an issue with the Google Drive downloader not being able to download files when not prompted with a harmful file warning
+* Fixed Wabbajack not properly sourcing files from other installed games (for example when using Skyrim SE DLC on Skyrim VR modlists) ([@JanuarySnow](https://www.github.com/JanuarySnow)])
+* Fixed Wabbajack crashing when navigating the 'Has Mod(s)' filter in the gallery with arrow keys
+
 #### Version - 4.0.3.0 - 7/18/2025
 * The link to a missing Nexus file now directly opens to the specific missing archive instead of the general mod page ([@ninjawaffle](https://www.github.com/ninjawaffle))
 * Fixed version not properly being inlined into the executable ([@EzioTheDeadPoet](https://www.github.com/EzioTheDeadPoet))
   * This means you won't see a 4.0.0.0 version in the bottom left of Wabbajack when you actually have 4.0.2.0.
 * Reintroduced hash-game-files function in the CLI to add support for new games ([@JanuarySnow](https://www.github.com/JanuarySnow))
-* Added support for extracting InnoSetup executables ([@EzioTheDeadPoet](https://www.github.com/EzioTheDeadPoet)))
+* Added support for extracting InnoSetup executables ([@EzioTheDeadPoet](https://www.github.com/EzioTheDeadPoet))
   * As part of this, temporary files are now extracted to shorter folder names
 * Fixed a bug where searching for Nexus archives in the modlist overview would only search on the mod name instead of the archive name
 * Fixed the MEGA integration breaking with 402 Payment Required error messages after they implemented hashcashes

Wabbajack.App.Wpf/Themes/Styles.xaml

@@ -2867,7 +2867,6 @@
         <Setter Property="Background" Value="{StaticResource ComplementaryPrimary08Brush}"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MultiSelectComboBox.FocusVisual}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:ExtendedListBoxItem}">

Wabbajack.App.Wpf/ViewModels/Installers/InstallationVM.cs

@@ -619,9 +619,11 @@ await Task.Run(async () =>
 
             try
             {
+                var canSource = GameRegistry.Games[ModList.GameType].CanSourceFrom ?? Array.Empty<Game>();
                 var cfg = new InstallerConfiguration
                 {
                     Game = ModList.GameType,
+                    OtherGames = canSource,
                     Downloads = Installer.DownloadLocation.TargetPath,
                     Install = Installer.Location.TargetPath,
                     ModList = ModList,

Wabbajack.Downloaders.GoogleDrive/GoogleDriveDownloader.cs

@@ -151,6 +151,13 @@ public override IEnumerable<string> MetaIni(Archive a, DTOs.DownloadStates.Googl
                     }
                 }
             }
+            else if(warning == default && response.Content.Headers.ContentType?.MediaType == "application/octet-stream")
+            {
+                qb.Add("id", state.Id);
+                qb.Add("export", "download");
+                url = $"https://drive.usercontent.google.com/download";
+            }
+
             response.Dispose();
 
             var httpState = new HttpRequestMessage(HttpMethod.Get, url + qb.ToString());

Wabbajack.Downloaders.Nexus/NexusDownloader.cs

@@ -46,9 +46,12 @@ public NexusDownloader(ILogger<NexusDownloader> logger, HttpClient client, IHttp
         _interventionLimiter = interventionLimiter;
     }
 
-    public override Task<bool> Prepare()
+    public override async Task<bool> Prepare()
     {
-        return Task.FromResult(_api.AuthInfo.HaveToken());
+        if (!_api.AuthInfo.HaveToken()) return false;
+
+        await EnsureLoginStillValid();
+        return true;
     }
 
     public override bool IsAllowed(ServerAllowList allowList, IDownloadState state)
@@ -121,6 +124,8 @@ public Uri UnParse(IDownloadState state)
     public override async Task<Hash> Download(Archive archive, Nexus state, AbsolutePath destination,
         IJob job, CancellationToken token)
     {
+        await EnsureLoginStillValid();
+
         if (IsManualDebugMode || !(await _api.IsPremium(token)))
         {
             return await DownloadManually(archive, state, destination, job, token);
@@ -168,6 +173,15 @@ public override async Task<Hash> Download(Archive archive, Nexus state, Absolute
         }
     }
 
+    private async Task EnsureLoginStillValid()
+    {
+        var oAuthToken = await _api.AuthInfo.Get();
+        if (oAuthToken?.OAuth?.IsExpired ?? true)
+        {
+            await _api.Validate();
+        }
+    }
+
     private async Task<Hash> DownloadManually(Archive archive, Nexus state, AbsolutePath destination, IJob job, CancellationToken token)
     {
         var md = new ManualDownload(new Archive
@@ -206,6 +220,7 @@ public override async Task<bool> Verify(Archive archive, Nexus state, IJob job,
     {
         try
         {
+            await EnsureLoginStillValid();
             var fileInfo = await _api.FileInfo(state.Game.MetaData().NexusName!, state.ModID, state.FileID, token);
             var (modInfo, _) = await _api.ModInfo(state.Game.MetaData().NexusName!, state.ModID, token);
 

Wabbajack.Installer/AInstaller.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -455,32 +455,45 @@ public async Task HashArchives(CancellationToken token)
         NextStep(Consts.StepHashing, "Hashing Archives", 0);
         _logger.LogInformation("Looking for files to hash");
 
+        // Collect all game folders – primary plus other games
+        var gameFolders = new HashSet<AbsolutePath>();
+
+        void AddIfValid(AbsolutePath p)
+        {
+            if (p != default && p != AbsolutePath.Empty)
+                gameFolders.Add(p);
+        }
+
+        AddIfValid(_gameLocator.GameLocation(_configuration.Game));
+
+        foreach (var g in _configuration.OtherGames ?? Array.Empty<Game>())
+            AddIfValid(_gameLocator.GameLocation(g));
+
+        // Enumerate downloads + every game folder
         var allFiles = _configuration.Downloads.EnumerateFiles()
-            .Concat(_gameLocator.GameLocation(_configuration.Game).EnumerateFiles())
+            .Concat(gameFolders.SelectMany(p => p.EnumerateFiles()))
             .ToList();
 
         _logger.LogInformation("Getting archive sizes");
-        var hashDict = (await allFiles.PMapAllBatched(_limiter, x => (x, x.Size())).ToList())
+        var hashDict = (await allFiles.PMapAllBatched(_limiter,
+                                                      x => (x, x.Size())).ToList())
             .GroupBy(f => f.Item2)
             .ToDictionary(g => g.Key, g => g.Select(v => v.x));
 
         _logger.LogInformation("Linking archives to downloads");
         var toHash = ModList.Archives.Where(a => hashDict.ContainsKey(a.Size))
-            .SelectMany(a => hashDict[a.Size]).ToList();
+            .SelectMany(a => hashDict[a.Size])
+            .ToList();
 
         MaxStepProgress = toHash.Count;
+        _logger.LogInformation("Found {count} total files, {hashedCount} matching filesize",
+                               allFiles.Count, toHash.Count);
 
-        _logger.LogInformation("Found {count} total files, {hashedCount} matching filesize", allFiles.Count,
-            toHash.Count);
-
-        var hashResults = await
-            toHash
-                .PMapAll(async e =>
-                {
-                    UpdateProgress(1);
-                    return (await FileHashCache.FileHashCachedAsync(e, token), e);
-                })
-                .ToList();
+        var hashResults = await toHash.PMapAll(async e =>
+        {
+            UpdateProgress(1);
+            return (await FileHashCache.FileHashCachedAsync(e, token), e);
+        }).ToList();
 
         HashedArchives = hashResults
             .OrderByDescending(e => e.Item2.LastModified())
@@ -491,6 +504,8 @@ public async Task HashArchives(CancellationToken token)
     }
 
 
+
+
     /// <summary>
     ///     The user may already have some files in the _configuration.Install. If so we can go through these and
     ///     figure out which need to be updated, deleted, or left alone

Wabbajack.Installer/InstallerConfiguration.cs

@@ -1,3 +1,4 @@
+using System;
 using Wabbajack.DTOs;
 using Wabbajack.Paths;
 
@@ -11,6 +12,7 @@ public class InstallerConfiguration
     public AbsolutePath Downloads { get; set; }
     public SystemParameters? SystemParameters { get; set; }
     public Game Game { get; set; }
+    public Game[]? OtherGames { get; set; } = Array.Empty<Game>();
     public AbsolutePath GameFolder { get; set; }
 
     public ModlistMetadata? Metadata { get; set; }