Add faster file download approach

Wabbajack.App.Wpf/Settings.cs

@@ -1,4 +1,5 @@
-using Wabbajack.Downloaders;
+using SteamKit2.GC.Dota.Internal;
+using Wabbajack.Downloaders;
 using Wabbajack.DTOs.JsonConverters;
 using Wabbajack.Paths;
 using Wabbajack.RateLimiter;
@@ -14,41 +15,65 @@ public class Mo2ModlistInstallationSettings
         public bool AutomaticallyOverrideExistingInstall { get; set; }
     }
 
-    public class PerformanceSettings : ViewModel
+    public class PerformanceSettingsViewModel : ViewModel
     {
         private readonly Configuration.MainSettings _settings;
-        private readonly int _defaultMaximumMemoryPerDownloadThreadMb;
+        private readonly int _defaultMaximumMemoryPerDownloadThreadMB;
+        private readonly long _defaultMinimumFileSizeForResumableDownloadMB;
 
-        public PerformanceSettings(Configuration.MainSettings settings, IResource<DownloadDispatcher> downloadResources, SystemParametersConstructor systemParams)
+        public PerformanceSettingsViewModel(Configuration.MainSettings settings, IResource<DownloadDispatcher> downloadResources, SystemParametersConstructor systemParams)
         {
             var p = systemParams.Create();
 
             _settings = settings;
             // Split half of available memory among download threads
-            _defaultMaximumMemoryPerDownloadThreadMb = (int)(p.SystemMemorySize / downloadResources.MaxTasks / 1024 / 1024) / 2;
-            _maximumMemoryPerDownloadThreadMb = settings.PerformanceSettings.MaximumMemoryPerDownloadThreadMb;
+            _defaultMaximumMemoryPerDownloadThreadMB = (int)(p.SystemMemorySize / downloadResources.MaxTasks / 1024 / 1024) / 2;
+            _defaultMinimumFileSizeForResumableDownloadMB = long.MaxValue;
+            _maximumMemoryPerDownloadThreadMB = settings.MaximumMemoryPerDownloadThreadInMB;
+            _minimumFileSizeForResumableDownloadMB = settings.MinimumFileSizeForResumableDownloadMB;
 
             if (MaximumMemoryPerDownloadThreadMb < 0)
             {
                 ResetMaximumMemoryPerDownloadThreadMb();
             }
+
+            if (settings.MinimumFileSizeForResumableDownloadMB < 0)
+            {
+                ResetMinimumFileSizeForResumableDownload();
+            }
         }
 
-        private int _maximumMemoryPerDownloadThreadMb;
+        private int _maximumMemoryPerDownloadThreadMB;
+        private long _minimumFileSizeForResumableDownloadMB;
 
         public int MaximumMemoryPerDownloadThreadMb
         {
-            get => _maximumMemoryPerDownloadThreadMb;
+            get => _maximumMemoryPerDownloadThreadMB;
+            set
+            {
+                RaiseAndSetIfChanged(ref _maximumMemoryPerDownloadThreadMB, value);
+                _settings.MaximumMemoryPerDownloadThreadInMB = value;
+            }
+        }
+
+        public long MinimumFileSizeForResumableDownload
+        {
+            get => _minimumFileSizeForResumableDownloadMB;
             set
             {
-                RaiseAndSetIfChanged(ref _maximumMemoryPerDownloadThreadMb, value);
-                _settings.PerformanceSettings.MaximumMemoryPerDownloadThreadMb = value;
+                RaiseAndSetIfChanged(ref _minimumFileSizeForResumableDownloadMB, value);
+                _settings.MinimumFileSizeForResumableDownloadMB = value;
             }
         }
 
         public void ResetMaximumMemoryPerDownloadThreadMb()
         {
-            MaximumMemoryPerDownloadThreadMb = _defaultMaximumMemoryPerDownloadThreadMb;
+            MaximumMemoryPerDownloadThreadMb = _defaultMaximumMemoryPerDownloadThreadMB;
+        }
+
+        public void ResetMinimumFileSizeForResumableDownload()
+        {
+            MinimumFileSizeForResumableDownload = _defaultMinimumFileSizeForResumableDownloadMB;
         }
     }
 }

Wabbajack.App.Wpf/View Models/Compilers/CompilerVM.cs

@@ -46,7 +46,7 @@ public class CompilerVM : BackNavigatingVM, ICpuStatusVM
     {
         private const string LastSavedCompilerSettings = "last-saved-compiler-settings";
         private readonly DTOSerializer _dtos;
-        private readonly SettingsManager _settingsManager;
+        private readonly ISettingsManager _settingsManager;
         private readonly IServiceProvider _serviceProvider;
         private readonly ILogger<CompilerVM> _logger;
         private readonly ResourceMonitor _resourceMonitor;
@@ -106,7 +106,7 @@ public class CompilerVM : BackNavigatingVM, ICpuStatusVM
 
         [Reactive] public ErrorResponse ErrorState { get; private set; }
 
-        public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, SettingsManager settingsManager,
+        public CompilerVM(ILogger<CompilerVM> logger, DTOSerializer dtos, ISettingsManager settingsManager,
             IServiceProvider serviceProvider, LogStream loggerProvider, ResourceMonitor resourceMonitor,
             CompilerSettingsInferencer inferencer, Client wjClient, IEnumerable<INeedsLogin> logins, DownloadDispatcher downloadDispatcher) : base(logger)
         {

Wabbajack.App.Wpf/View Models/Gallery/ModListGalleryVM.cs

@@ -1,6 +1,4 @@
-
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -77,13 +75,13 @@ public GameTypeEntry SelectedGameTypeEntry
         private readonly ILogger<ModListGalleryVM> _logger;
         private readonly GameLocator _locator;
         private readonly ModListDownloadMaintainer _maintainer;
-        private readonly SettingsManager _settingsManager;
+        private readonly ISettingsManager _settingsManager;
         private readonly CancellationToken _cancellationToken;
 
         public ICommand ClearFiltersCommand { get; set; }
 
         public ModListGalleryVM(ILogger<ModListGalleryVM> logger, Client wjClient, GameLocator locator,
-            SettingsManager settingsManager, ModListDownloadMaintainer maintainer, CancellationToken cancellationToken)
+            ISettingsManager settingsManager, ModListDownloadMaintainer maintainer, CancellationToken cancellationToken)
             : base(logger)
         {
             _wjClient = wjClient;

Wabbajack.App.Wpf/View Models/Installers/InstallerVM.cs

@@ -15,7 +15,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Shell;
-using System.Windows.Threading;
 using Microsoft.Extensions.Logging;
 using Microsoft.WindowsAPICodePack.Dialogs;
 using Wabbajack.Common;
@@ -34,7 +33,6 @@
 using Wabbajack.Paths.IO;
 using Wabbajack.Services.OSIntegrated;
 using Wabbajack.Util;
-using System.Windows.Forms;
 using Microsoft.Extensions.DependencyInjection;
 using Wabbajack.CLI.Verbs;
 using Wabbajack.VFS;
@@ -114,7 +112,7 @@ public class InstallerVM : BackNavigatingVM, IBackNavigatingVM, ICpuStatusVM
 
     private readonly DTOSerializer _dtos;
     private readonly ILogger<InstallerVM> _logger;
-    private readonly SettingsManager _settingsManager;
+    private readonly ISettingsManager _settingsManager;
     private readonly IServiceProvider _serviceProvider;
     private readonly SystemParametersConstructor _parametersConstructor;
     private readonly IGameLocator _gameLocator;
@@ -156,7 +154,7 @@ public class InstallerVM : BackNavigatingVM, IBackNavigatingVM, ICpuStatusVM
 
     public ReactiveCommand<Unit, Unit> VerifyCommand { get; }
 
-    public InstallerVM(ILogger<InstallerVM> logger, DTOSerializer dtos, SettingsManager settingsManager, IServiceProvider serviceProvider,
+    public InstallerVM(ILogger<InstallerVM> logger, DTOSerializer dtos, ISettingsManager settingsManager, IServiceProvider serviceProvider,
         SystemParametersConstructor parametersConstructor, IGameLocator gameLocator, LogStream loggerProvider, ResourceMonitor resourceMonitor,
         Wabbajack.Services.OSIntegrated.Configuration configuration, HttpClient client, DownloadDispatcher dispatcher, IEnumerable<INeedsLogin> logins,
         CancellationToken cancellationToken) : base(logger)

Wabbajack.App.Wpf/View Models/Settings/SettingsVM.cs

@@ -24,10 +24,10 @@ namespace Wabbajack
     public class SettingsVM : BackNavigatingVM
     {
         private readonly Configuration.MainSettings _settings;
-        private readonly SettingsManager _settingsManager;
+        private readonly ISettingsManager _settingsManager;
 
         public LoginManagerVM Login { get; }
-        public PerformanceSettings Performance { get; }
+        public PerformanceSettingsViewModel Performance { get; }
         public AuthorFilesVM AuthorFile { get; }
 
         public ICommand OpenTerminalCommand { get; }
@@ -36,14 +36,14 @@ public SettingsVM(ILogger<SettingsVM> logger, IServiceProvider provider)
             : base(logger)
         {
             _settings = provider.GetRequiredService<Configuration.MainSettings>();
-            _settingsManager = provider.GetRequiredService<SettingsManager>();
+            _settingsManager = provider.GetRequiredService<ISettingsManager>();
 
             Login = new LoginManagerVM(provider.GetRequiredService<ILogger<LoginManagerVM>>(), this,
                 provider.GetRequiredService<IEnumerable<INeedsLogin>>());
             AuthorFile = new AuthorFilesVM(provider.GetRequiredService<ILogger<AuthorFilesVM>>()!,
                 provider.GetRequiredService<WabbajackApiTokenProvider>()!, provider.GetRequiredService<Client>()!, this);
             OpenTerminalCommand = ReactiveCommand.CreateFromTask(OpenTerminal);
-            Performance = new PerformanceSettings(
+            Performance = new PerformanceSettingsViewModel(
                 _settings,
                 provider.GetRequiredService<IResource<DownloadDispatcher>>(),
                 provider.GetRequiredService<SystemParametersConstructor>());

Wabbajack.App.Wpf/Views/Settings/PerformanceSettingsView.xaml

@@ -9,7 +9,7 @@
     xmlns:xwpf="http://schemas.xceed.com/wpf/xaml/toolkit"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    x:TypeArguments="local:PerformanceSettings"
+    x:TypeArguments="local:PerformanceSettingsViewModel"
     mc:Ignorable="d">
     <Border
         x:Name="PerformanceView"
@@ -71,6 +71,30 @@
                 HorizontalAlignment="Left">
                 <TextBlock FontSize="14">Reset</TextBlock>
             </Button>
+            <TextBlock
+                Grid.Row="6"
+                FontSize="14"
+                Foreground="{StaticResource ForegroundBrush}"
+                Text="Minimum File Size for Fast Download (MB)"
+                ToolTip="Defines the file size at which a slower but more robust download process will be used. If you have slow or unreliable internet this should be kept at zero." />
+            <xwpf:LongUpDown
+                x:Name="MinimumFileSizeForResumableDownloadIntegerUpDown"
+                Grid.Row="6"
+                Grid.Column="2"
+                Width="80"
+                HorizontalAlignment="Left"
+                Foreground="{StaticResource ForegroundBrush}"
+                Maximum="1000000000"
+                Minimum="0" />
+            <Button
+                x:Name="ResetMinimumFileSizeForResumableDownload"
+                Grid.Row="6"
+                Grid.Column="3"
+                Margin="20,0,0,0"
+                Padding="10,0"
+                HorizontalAlignment="Left">
+                <TextBlock FontSize="14">Reset</TextBlock>
+            </Button>
         </Grid>
     </Border>
 </rxui:ReactiveUserControl>

Wabbajack.App.Wpf/Views/Settings/PerformanceSettingsView.xaml.cs

@@ -8,7 +8,7 @@ namespace Wabbajack
     /// <summary>
     /// Interaction logic for PerformanceSettingsView.xaml
     /// </summary>
-    public partial class PerformanceSettingsView : ReactiveUserControl<PerformanceSettings>
+    public partial class PerformanceSettingsView : ReactiveUserControl<PerformanceSettingsViewModel>
     {
         public PerformanceSettingsView()
         {
@@ -21,16 +21,29 @@ public PerformanceSettingsView()
                         x => x.MaximumMemoryPerDownloadThreadMb,
                         x => x.MaximumMemoryPerDownloadThreadIntegerUpDown.Value)
                     .DisposeWith(disposable);
+
+                this.BindStrict(
+                        ViewModel,
+                        x => x.MinimumFileSizeForResumableDownload,
+                        x => x.MinimumFileSizeForResumableDownloadIntegerUpDown.Value)
+                    .DisposeWith(disposable);
+
                 this.EditResourceSettings.Command = ReactiveCommand.Create(() =>
                 {
                     UIUtils.OpenFile(
                         KnownFolders.WabbajackAppLocal.Combine("saved_settings", "resource_settings.json"));
                     Environment.Exit(0);
                 });
+
                 ResetMaximumMemoryPerDownloadThread.Command = ReactiveCommand.Create(() =>
                 {
                     ViewModel.ResetMaximumMemoryPerDownloadThreadMb();
                 });
+
+                ResetMinimumFileSizeForResumableDownload.Command = ReactiveCommand.Create(() =>
+                {
+                    ViewModel.ResetMinimumFileSizeForResumableDownload();
+                });
             });
         }
     }

Wabbajack.CLI/Program.cs

@@ -1,7 +1,6 @@
 using System;
 using System.CommandLine;
 using System.CommandLine.IO;
-using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,14 +10,13 @@
 using NLog.Targets;
 using Octokit;
 using Wabbajack.DTOs.Interventions;
-using Wabbajack.Networking.Http;
-using Wabbajack.Networking.Http.Interfaces;
 using Wabbajack.Paths.IO;
 using Wabbajack.Server.Lib;
 using Wabbajack.Services.OSIntegrated;
 using Wabbajack.VFS;
 using Client = Wabbajack.Networking.GitHub.Client;
 using Wabbajack.CLI.Builder;
+using Wabbajack.Downloader.Services;
 
 namespace Wabbajack.CLI;
 
@@ -31,8 +29,7 @@ private static async Task<int> Main(string[] args)
             .ConfigureServices((host, services) =>
             {
                 services.AddSingleton(new JsonSerializerOptions());
-                services.AddSingleton<HttpClient, HttpClient>();
-                services.AddSingleton<IHttpDownloader, SingleThreadedDownloader>();
+                services.AddDownloaderService();
                 services.AddSingleton<IConsole, SystemConsole>();
                 services.AddSingleton<CommandLineBuilder, CommandLineBuilder>();
                 services.AddSingleton<TemporaryFileManager>();

Wabbajack.CLI/VerbRegistration.cs

@@ -45,8 +45,6 @@ public static void AddCLIVerbs(this IServiceCollection services) {
 services.AddSingleton<MirrorFile>();
 CommandLineBuilder.RegisterCommand<ModlistReport>(ModlistReport.Definition, c => ((ModlistReport)c).Run);
 services.AddSingleton<ModlistReport>();
-CommandLineBuilder.RegisterCommand<SetNexusApiKey>(SetNexusApiKey.Definition, c => ((SetNexusApiKey)c).Run);
-services.AddSingleton<SetNexusApiKey>();
 CommandLineBuilder.RegisterCommand<SteamDownloadFile>(SteamDownloadFile.Definition, c => ((SteamDownloadFile)c).Run);
 services.AddSingleton<SteamDownloadFile>();
 CommandLineBuilder.RegisterCommand<SteamDumpAppInfo>(SteamDumpAppInfo.Definition, c => ((SteamDumpAppInfo)c).Run);