From acf0bee082c93d759e5d2676bc402287fd3d8066 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Fri, 20 May 2022 17:00:54 -0600 Subject: [PATCH] Change how we display downloading files in the UI --- Wabbajack.Downloaders.Dispatcher/DownloadDispatcher.cs | 4 ++-- Wabbajack.Downloaders.Nexus/NexusDownloader.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Wabbajack.Downloaders.Dispatcher/DownloadDispatcher.cs b/Wabbajack.Downloaders.Dispatcher/DownloadDispatcher.cs index f2d9621f..c111d712 100644 --- a/Wabbajack.Downloaders.Dispatcher/DownloadDispatcher.cs +++ b/Wabbajack.Downloaders.Dispatcher/DownloadDispatcher.cs @@ -37,8 +37,8 @@ public class DownloadDispatcher public async Task Download(Archive a, AbsolutePath dest, CancellationToken token) { - using var downloadScope = _logger.BeginScope("Downloading {primaryKeyString}", a.State.PrimaryKeyString); - using var job = await _limiter.Begin(a.State.PrimaryKeyString, a.Size, token); + using var downloadScope = _logger.BeginScope("Downloading {Name}", a.Name); + using var job = await _limiter.Begin("Downloading " + a.Name, a.Size, token); return await Download(a, dest, job, token); } diff --git a/Wabbajack.Downloaders.Nexus/NexusDownloader.cs b/Wabbajack.Downloaders.Nexus/NexusDownloader.cs index 7eca13f2..b6d65c39 100644 --- a/Wabbajack.Downloaders.Nexus/NexusDownloader.cs +++ b/Wabbajack.Downloaders.Nexus/NexusDownloader.cs @@ -33,7 +33,7 @@ public class NexusDownloader : ADownloader, IUrlDownloader private readonly IUserInterventionHandler _userInterventionHandler; private readonly IResource _interventionLimiter; - private const bool IsManualDebugMode = true; + private const bool IsManualDebugMode = false; public NexusDownloader(ILogger logger, HttpClient client, IHttpDownloader downloader, NexusApi api, IUserInterventionHandler userInterventionHandler, IResource interventionLimiter) @@ -115,7 +115,7 @@ public class NexusDownloader : ADownloader, IUrlDownloader public override async Task Download(Archive archive, Nexus state, AbsolutePath destination, IJob job, CancellationToken token) { - if (IsManualDebugMode || await _api.IsPremium(token)) + if (IsManualDebugMode || !(await _api.IsPremium(token))) { return await DownloadManually(archive, state, destination, job, token); }