From 5fc070e5d3586764122d8bf0e7d8e233efb416bc Mon Sep 17 00:00:00 2001
From: Timothy Baldridge <tbaldridge@gmail.com>
Date: Tue, 9 Nov 2021 21:51:37 -0700
Subject: [PATCH] Move config code into OSIntegrated

---
 Wabbajack.App/App.axaml                       |  1 +
 Wabbajack.App/Controls/BrowseItemViewModel.cs |  1 +
 Wabbajack.App/Controls/ResourceViewModel.cs   |  6 +-
 Wabbajack.App/Models/ImageCache.cs            |  1 +
 Wabbajack.App/Screens/BrowseViewModel.cs      |  4 +-
 .../Screens/CompilerConfigurationViewModel.cs |  1 +
 Wabbajack.App/Screens/SettingsView.axaml      | 32 +++++++----
 Wabbajack.App/Screens/SettingsView.axaml.cs   |  3 +-
 Wabbajack.App/Screens/SettingsViewModel.cs    | 10 +++-
 Wabbajack.App/ServiceExtensions.cs            | 11 ----
 Wabbajack.App/Utilities/LoggerProvider.cs     |  1 +
 .../InstallConfigurationViewModel.cs          |  1 +
 Wabbajack.CLI/Program.cs                      |  1 -
 Wabbajack.Compiler.Test/Startup.cs            |  1 +
 .../ServiceExtensions.cs                      |  2 +
 .../ServiceExtensions.cs                      |  3 +-
 .../Configuration.cs                          |  2 +-
 .../ResourceSettingsManager.cs                | 55 +++++++++++++++++++
 .../ServiceExtensions.cs                      | 16 ++++++
 .../SettingsManager.cs                        |  2 +-
 20 files changed, 122 insertions(+), 32 deletions(-)
 rename {Wabbajack.App => Wabbajack.Services.OSIntegrated}/Configuration.cs (88%)
 create mode 100644 Wabbajack.Services.OSIntegrated/ResourceSettingsManager.cs
 rename {Wabbajack.App/Models => Wabbajack.Services.OSIntegrated}/SettingsManager.cs (97%)

diff --git a/Wabbajack.App/App.axaml b/Wabbajack.App/App.axaml
index 842e97aa..2f026076 100644
--- a/Wabbajack.App/App.axaml
+++ b/Wabbajack.App/App.axaml
@@ -9,6 +9,7 @@
     <Application.Styles>
         <StyleInclude Source="avares://Material.Icons.Avalonia/App.xaml" />
         <FluentTheme Mode="Dark" />
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
         <StyleInclude Source="avares://Wabbajack.App/Assets/Wabbajack.axaml" />
         <Style Selector="Button:not(:pointerover) /template/ ContentPresenter">
             <Setter Property="Background" Value="Transparent" />
diff --git a/Wabbajack.App/Controls/BrowseItemViewModel.cs b/Wabbajack.App/Controls/BrowseItemViewModel.cs
index 5e0b7d05..dfa9d9b4 100644
--- a/Wabbajack.App/Controls/BrowseItemViewModel.cs
+++ b/Wabbajack.App/Controls/BrowseItemViewModel.cs
@@ -21,6 +21,7 @@ using Wabbajack.DTOs.JsonConverters;
 using Wabbajack.Paths;
 using Wabbajack.Paths.IO;
 using Wabbajack.RateLimiter;
+using Wabbajack.Services.OSIntegrated;
 using Wabbajack.VFS;
 
 namespace Wabbajack.App.Controls;
diff --git a/Wabbajack.App/Controls/ResourceViewModel.cs b/Wabbajack.App/Controls/ResourceViewModel.cs
index d3b51c1d..f6f41f0f 100644
--- a/Wabbajack.App/Controls/ResourceViewModel.cs
+++ b/Wabbajack.App/Controls/ResourceViewModel.cs
@@ -5,6 +5,7 @@ using System.Timers;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Wabbajack.App.ViewModels;
+using Wabbajack.Common;
 using Wabbajack.RateLimiter;
 
 namespace Wabbajack.App.Controls;
@@ -18,7 +19,7 @@ public class ResourceViewModel : ViewModelBase, IActivatableViewModel, IDisposab
     {
         Activator = new ViewModelActivator();
         _resource = resource;
-        _timer = new Timer(1.0);
+        _timer = new Timer(250);
 
         Name = resource.Name;
 
@@ -50,6 +51,8 @@ public class ResourceViewModel : ViewModelBase, IActivatableViewModel, IDisposab
     [Reactive] public long CurrentThroughput { get; set; }
 
     [Reactive] public string Name { get; set; }
+    
+    [Reactive] public string ThroughputHumanFriendly { get; set; }
 
 
     public void Dispose()
@@ -62,5 +65,6 @@ public class ResourceViewModel : ViewModelBase, IActivatableViewModel, IDisposab
         MaxTasks = _resource.MaxTasks;
         MaxThroughput = _resource.MaxThroughput;
         CurrentThroughput = _resource.StatusReport.Transferred;
+        ThroughputHumanFriendly = _resource.StatusReport.Transferred.ToFileSizeString();
     }
 }
\ No newline at end of file
diff --git a/Wabbajack.App/Models/ImageCache.cs b/Wabbajack.App/Models/ImageCache.cs
index 202331a8..51408fce 100644
--- a/Wabbajack.App/Models/ImageCache.cs
+++ b/Wabbajack.App/Models/ImageCache.cs
@@ -12,6 +12,7 @@ using Wabbajack.Hashing.xxHash64;
 using Wabbajack.Paths;
 using Wabbajack.Paths.IO;
 using Wabbajack.RateLimiter;
+using Wabbajack.Services.OSIntegrated;
 using Wabbajack.VFS;
 
 namespace Wabbajack.App.Models;
diff --git a/Wabbajack.App/Screens/BrowseViewModel.cs b/Wabbajack.App/Screens/BrowseViewModel.cs
index 04c51879..0c5e0027 100644
--- a/Wabbajack.App/Screens/BrowseViewModel.cs
+++ b/Wabbajack.App/Screens/BrowseViewModel.cs
@@ -31,7 +31,7 @@ namespace Wabbajack.App.Screens;
 
 public class BrowseViewModel : ViewModelBase, IActivatableViewModel
 {
-    private readonly Configuration _configuration;
+    private readonly Wabbajack.Services.OSIntegrated.Configuration _configuration;
     private readonly DownloadDispatcher _dispatcher;
     private readonly IResource<DownloadDispatcher> _dispatcherLimiter;
     private readonly DTOSerializer _dtos;
@@ -54,7 +54,7 @@ public class BrowseViewModel : ViewModelBase, IActivatableViewModel
         IResource<HttpClient> limiter, FileHashCache hashCache,
         IResource<DownloadDispatcher> dispatcherLimiter, DownloadDispatcher dispatcher, GameLocator gameLocator,
         ImageCache imageCache,
-        DTOSerializer dtos, Configuration configuration)
+        DTOSerializer dtos, Wabbajack.Services.OSIntegrated.Configuration configuration)
     {
         LoadingLock = new LoadingLock();
         Activator = new ViewModelActivator();
diff --git a/Wabbajack.App/Screens/CompilerConfigurationViewModel.cs b/Wabbajack.App/Screens/CompilerConfigurationViewModel.cs
index e4ffb383..b7d648ba 100644
--- a/Wabbajack.App/Screens/CompilerConfigurationViewModel.cs
+++ b/Wabbajack.App/Screens/CompilerConfigurationViewModel.cs
@@ -18,6 +18,7 @@ using Wabbajack.DTOs.JsonConverters;
 using Wabbajack.Installer;
 using Wabbajack.Paths;
 using Wabbajack.Paths.IO;
+using Wabbajack.Services.OSIntegrated;
 using Consts = Wabbajack.Compiler.Consts;
 
 namespace Wabbajack.App.Screens;
diff --git a/Wabbajack.App/Screens/SettingsView.axaml b/Wabbajack.App/Screens/SettingsView.axaml
index fb56369c..d2742e5c 100644
--- a/Wabbajack.App/Screens/SettingsView.axaml
+++ b/Wabbajack.App/Screens/SettingsView.axaml
@@ -38,18 +38,26 @@
             <Grid RowDefinitions="Auto, Auto">
                 <TextBlock FontSize="20" Grid.ColumnSpan="4">Resource Limits</TextBlock>
 
-                <ItemsControl Grid.Row="1" x:Name="ResourceList">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel Orientation="Vertical" />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <controls:ResourceView />
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
+                <DataGrid Grid.Row="1" AutoGenerateColumns="False" x:Name="ResourcesList">
+                    <DataGrid.Columns>
+                        <DataGridTemplateColumn Header="Resource">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding Name}" FontWeight="Bold"></TextBlock>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn Header="Maximum Tasks" Binding="{Binding MaxTasks}"></DataGridTextColumn>
+                        <DataGridTextColumn Header="Maximum Throughput" Binding="{Binding MaxThroughput}"></DataGridTextColumn>
+                        <DataGridTemplateColumn Header="Transferred">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding TransferredHumanFriendly}"></TextBlock>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
 
             </Grid>
         </Border>
diff --git a/Wabbajack.App/Screens/SettingsView.axaml.cs b/Wabbajack.App/Screens/SettingsView.axaml.cs
index 14d0306e..1861acff 100644
--- a/Wabbajack.App/Screens/SettingsView.axaml.cs
+++ b/Wabbajack.App/Screens/SettingsView.axaml.cs
@@ -28,8 +28,9 @@ public partial class SettingsView : ScreenBase<SettingsViewModel>
                 .DisposeWith(disposables);
 
             
-            this.OneWayBind(ViewModel, vm => vm.Resources, view => view.ResourceList.Items)
+            this.OneWayBind(ViewModel, vm => vm.Resources, view => view.ResourcesList.Items)
                 .DisposeWith(disposables);
+
         });
     }
 }
\ No newline at end of file
diff --git a/Wabbajack.App/Screens/SettingsViewModel.cs b/Wabbajack.App/Screens/SettingsViewModel.cs
index 679b910d..ee04e0d0 100644
--- a/Wabbajack.App/Screens/SettingsViewModel.cs
+++ b/Wabbajack.App/Screens/SettingsViewModel.cs
@@ -13,6 +13,7 @@ using Wabbajack.App.ViewModels;
 using Wabbajack.Paths;
 using Wabbajack.Paths.IO;
 using Wabbajack.RateLimiter;
+using Wabbajack.Services.OSIntegrated;
 using Wabbajack.Services.OSIntegrated.TokenProviders;
 
 namespace Wabbajack.App.Screens;
@@ -27,11 +28,18 @@ public class SettingsViewModel : ViewModelBase
         NexusApiTokenProvider nexusProvider, IEnumerable<IResource> resources, LoversLabTokenProvider llProvider, VectorPlexusTokenProvider vpProvider)
     {
         _logger = logger;
-        Resources = resources.Select(r => new ResourceViewModel(r)).ToArray();
+        Resources = resources.Select(r => new ResourceViewModel(r))
+            .OrderBy(o => o.Name)
+            .ToArray();
         Activator = new ViewModelActivator();
 
         this.WhenActivated(disposables =>
         {
+            foreach (var resource in Resources)
+            {
+                resource.Activator.Activate().DisposeWith(disposables);
+            }
+
             configuration.EncryptedDataLocation.CreateDirectory();
             Watcher = new FileSystemWatcher(configuration.EncryptedDataLocation.ToString());
             Watcher.DisposeWith(disposables);
diff --git a/Wabbajack.App/ServiceExtensions.cs b/Wabbajack.App/ServiceExtensions.cs
index c50ab48c..6529c5d1 100644
--- a/Wabbajack.App/ServiceExtensions.cs
+++ b/Wabbajack.App/ServiceExtensions.cs
@@ -93,17 +93,6 @@ public static class ServiceExtensions
             CachePath = KnownFolders.WabbajackAppLocal.Combine("cef_cache").ToString()
         });
 
-        services.AddSingleton(s => new Configuration
-        {
-            EncryptedDataLocation = KnownFolders.WabbajackAppLocal.Combine("encrypted"),
-            ModListsDownloadLocation = KnownFolders.EntryPoint.Combine("downloaded_mod_lists"),
-            SavedSettingsLocation = KnownFolders.WabbajackAppLocal.Combine("saved_settings"),
-            LogLocation = KnownFolders.EntryPoint.Combine("logs"),
-            ImageCacheLocation = KnownFolders.WabbajackAppLocal.Combine("image_cache")
-        });
-
-        services.AddSingleton<SettingsManager>();
-
         services.AddSingleton(s =>
         {
             App.FrameworkInitialized += App_FrameworkInitialized;
diff --git a/Wabbajack.App/Utilities/LoggerProvider.cs b/Wabbajack.App/Utilities/LoggerProvider.cs
index 4d3e7ad5..3ba19bfd 100644
--- a/Wabbajack.App/Utilities/LoggerProvider.cs
+++ b/Wabbajack.App/Utilities/LoggerProvider.cs
@@ -10,6 +10,7 @@ using DynamicData;
 using Microsoft.Extensions.Logging;
 using Wabbajack.Paths;
 using Wabbajack.Paths.IO;
+using Wabbajack.Services.OSIntegrated;
 
 namespace Wabbajack.App.Utilities;
 
diff --git a/Wabbajack.App/ViewModels/InstallConfigurationViewModel.cs b/Wabbajack.App/ViewModels/InstallConfigurationViewModel.cs
index 8552b32c..9b753e0a 100644
--- a/Wabbajack.App/ViewModels/InstallConfigurationViewModel.cs
+++ b/Wabbajack.App/ViewModels/InstallConfigurationViewModel.cs
@@ -20,6 +20,7 @@ using Wabbajack.DTOs.SavedSettings;
 using Wabbajack.Installer;
 using Wabbajack.Paths;
 using Wabbajack.Paths.IO;
+using Wabbajack.Services.OSIntegrated;
 
 namespace Wabbajack.App.ViewModels;
 
diff --git a/Wabbajack.CLI/Program.cs b/Wabbajack.CLI/Program.cs
index 436779c2..9ef7249e 100644
--- a/Wabbajack.CLI/Program.cs
+++ b/Wabbajack.CLI/Program.cs
@@ -46,7 +46,6 @@ internal class Program
                 services.AddSingleton(new ParallelOptions {MaxDegreeOfParallelism = Environment.ProcessorCount});
                 services.AddSingleton<Client>();
                 services.AddSingleton<Networking.WabbajackClientApi.Client>();
-                services.AddSingleton<Configuration>();
                 services.AddSingleton(s => new GitHubClient(new ProductHeaderValue("wabbajack")));
 
                 services.AddOSIntegrated();
diff --git a/Wabbajack.Compiler.Test/Startup.cs b/Wabbajack.Compiler.Test/Startup.cs
index 0ccbf57e..e7f75d37 100644
--- a/Wabbajack.Compiler.Test/Startup.cs
+++ b/Wabbajack.Compiler.Test/Startup.cs
@@ -4,6 +4,7 @@ using Wabbajack.Networking.WabbajackClientApi;
 using Wabbajack.Services.OSIntegrated;
 using Xunit.DependencyInjection;
 using Xunit.DependencyInjection.Logging;
+using Configuration = Wabbajack.Services.OSIntegrated.Configuration;
 
 namespace Wabbajack.Compiler.Test;
 
diff --git a/Wabbajack.Downloaders.Dispatcher/ServiceExtensions.cs b/Wabbajack.Downloaders.Dispatcher/ServiceExtensions.cs
index bedeb8ef..a7329e4f 100644
--- a/Wabbajack.Downloaders.Dispatcher/ServiceExtensions.cs
+++ b/Wabbajack.Downloaders.Dispatcher/ServiceExtensions.cs
@@ -4,6 +4,7 @@ using Wabbajack.Downloaders.IPS4OAuth2Downloader;
 using Wabbajack.Downloaders.MediaFire;
 using Wabbajack.Downloaders.ModDB;
 using Wabbajack.DTOs.JsonConverters;
+using Wabbajack.Networking.WabbajackClientApi;
 
 namespace Wabbajack.Downloaders;
 
@@ -23,6 +24,7 @@ public static class ServiceExtensions
             .AddIPS4OAuth2Downloaders()
             .AddWabbajackCDNDownloader()
             .AddGameFileDownloader()
+            .AddWabbajackClient()
             .AddSingleton<DownloadDispatcher>();
     }
 }
\ No newline at end of file
diff --git a/Wabbajack.Networking.WabbajackClientApi/ServiceExtensions.cs b/Wabbajack.Networking.WabbajackClientApi/ServiceExtensions.cs
index 4a8d4713..50c375ee 100644
--- a/Wabbajack.Networking.WabbajackClientApi/ServiceExtensions.cs
+++ b/Wabbajack.Networking.WabbajackClientApi/ServiceExtensions.cs
@@ -4,9 +4,10 @@ namespace Wabbajack.Networking.WabbajackClientApi;
 
 public static class ServiceExtensions
 {
-    public static void AddWabbajackClient(this IServiceCollection services)
+    public static IServiceCollection AddWabbajackClient(this IServiceCollection services)
     {
         services.AddSingleton<Configuration>();
         services.AddSingleton<Client>();
+        return services;
     }
 }
\ No newline at end of file
diff --git a/Wabbajack.App/Configuration.cs b/Wabbajack.Services.OSIntegrated/Configuration.cs
similarity index 88%
rename from Wabbajack.App/Configuration.cs
rename to Wabbajack.Services.OSIntegrated/Configuration.cs
index 5559d8cd..7adf650b 100644
--- a/Wabbajack.App/Configuration.cs
+++ b/Wabbajack.Services.OSIntegrated/Configuration.cs
@@ -1,6 +1,6 @@
 using Wabbajack.Paths;
 
-namespace Wabbajack.App;
+namespace Wabbajack.Services.OSIntegrated;
 
 public class Configuration
 {
diff --git a/Wabbajack.Services.OSIntegrated/ResourceSettingsManager.cs b/Wabbajack.Services.OSIntegrated/ResourceSettingsManager.cs
new file mode 100644
index 00000000..dc64e4f0
--- /dev/null
+++ b/Wabbajack.Services.OSIntegrated/ResourceSettingsManager.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Wabbajack.RateLimiter;
+using Wabbajack.Services.OSIntegrated;
+
+namespace Wabbajack.App.Models;
+
+public class ResourceSettingsManager
+{
+    private readonly SettingsManager _manager;
+    private Dictionary<string,ResourceSetting>? _settings;
+
+    public ResourceSettingsManager(SettingsManager manager)
+    {
+        _manager = manager;
+    }
+
+    public async Task<ResourceSetting> GetSettings(string name)
+    {
+        Monitor.Enter(_manager);
+        try
+        {
+            _settings ??= await _manager.Load<Dictionary<string, ResourceSetting>>("resource-settings");
+
+            if (_settings.TryGetValue(name, out var found)) return found;
+
+            var newSetting = new ResourceSetting
+            {
+                MaxTasks = Environment.ProcessorCount,
+                MaxThroughput = long.MaxValue
+            };
+            
+            _settings.Add(name, newSetting);
+
+            await _manager.Save("resource-settings", _settings);
+            
+            return _settings[name];
+        }
+        finally
+        {
+            Monitor.Exit(_manager);
+        }
+
+    }
+
+    public class ResourceSetting
+    {
+        public long MaxTasks { get; set; }
+        public long MaxThroughput { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/Wabbajack.Services.OSIntegrated/ServiceExtensions.cs b/Wabbajack.Services.OSIntegrated/ServiceExtensions.cs
index 4736f43f..ac55a3fd 100644
--- a/Wabbajack.Services.OSIntegrated/ServiceExtensions.cs
+++ b/Wabbajack.Services.OSIntegrated/ServiceExtensions.cs
@@ -4,6 +4,7 @@ using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Wabbajack.App.Models;
 using Wabbajack.Compiler;
 using Wabbajack.Downloaders;
 using Wabbajack.Downloaders.GameFile;
@@ -122,6 +123,21 @@ public static class ServiceExtensions
             OSVersion = Environment.OSVersion.VersionString,
             Version = version
         });
+        
+        // Settings
+        
+        service.AddSingleton(s => new Configuration
+        {
+            EncryptedDataLocation = KnownFolders.WabbajackAppLocal.Combine("encrypted"),
+            ModListsDownloadLocation = KnownFolders.EntryPoint.Combine("downloaded_mod_lists"),
+            SavedSettingsLocation = KnownFolders.WabbajackAppLocal.Combine("saved_settings"),
+            LogLocation = KnownFolders.EntryPoint.Combine("logs"),
+            ImageCacheLocation = KnownFolders.WabbajackAppLocal.Combine("image_cache")
+        });
+
+        service.AddSingleton<SettingsManager>();
+        service.AddSingleton<ResourceSettingsManager>();
+        
         return service;
     }
 
diff --git a/Wabbajack.App/Models/SettingsManager.cs b/Wabbajack.Services.OSIntegrated/SettingsManager.cs
similarity index 97%
rename from Wabbajack.App/Models/SettingsManager.cs
rename to Wabbajack.Services.OSIntegrated/SettingsManager.cs
index 7ca49047..f33c71cf 100644
--- a/Wabbajack.App/Models/SettingsManager.cs
+++ b/Wabbajack.Services.OSIntegrated/SettingsManager.cs
@@ -9,7 +9,7 @@ using Wabbajack.DTOs.JsonConverters;
 using Wabbajack.Paths;
 using Wabbajack.Paths.IO;
 
-namespace Wabbajack.App.Models;
+namespace Wabbajack.Services.OSIntegrated;
 
 public class SettingsManager
 {