Remember installation location from previous installs, do not log tra…

…ce & debug statements to UI log
wabbajack-tools · Jan 19, 2025 · 27b0c1f · 27b0c1f
1 parent efd5018
commit 27b0c1f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/Wabbajack.App.Wpf/App.xaml.cs b/Wabbajack.App.Wpf/App.xaml.cs
@@ -156,6 +156,7 @@ private void AddLogging(ILoggingBuilder loggingBuilder)
         config.AddRuleForAllLevels(uiTarget);
 
         loggingBuilder.ClearProviders();
+        loggingBuilder.AddFilter("System.Net.Http.HttpClient", LogLevel.Warning);
         loggingBuilder.SetMinimumLevel(LogLevel.Information);
         loggingBuilder.AddNLog(config);
     }

diff --git a/Wabbajack.App.Wpf/Views/Common/LogView.xaml b/Wabbajack.App.Wpf/Views/Common/LogView.xaml
@@ -8,6 +8,11 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
+    <UserControl.Resources>
+        <CollectionViewSource x:Key="FilteredRows"
+                              Source="{Binding LoggerProvider.MessageLog}"
+                              Filter="CollectionViewSource_Filter" />
+    </UserControl.Resources>
     <Border x:Name="BorderMask2" CornerRadius="8" BorderThickness="0" Background="White">
         <Grid Margin="-1">
             <Border x:Name="BorderMask" CornerRadius="8" Background="White" Margin="1" />
@@ -19,7 +24,7 @@
             local:AutoScrollBehavior.ScrollOnNewItem="True"
             BorderBrush="Transparent"
             BorderThickness="0"
-            ItemsSource="{Binding LoggerProvider.MessageLog}"
+            ItemsSource="{Binding Source={StaticResource FilteredRows}}"
             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
             AlternationCount="2">
                     <ListBox.Resources>

diff --git a/Wabbajack.App.Wpf/Views/Common/LogView.xaml.cs b/Wabbajack.App.Wpf/Views/Common/LogView.xaml.cs
@@ -1,5 +1,5 @@
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
+using static Wabbajack.Models.LogStream;
 
 namespace Wabbajack;
 
@@ -8,9 +8,14 @@ namespace Wabbajack;
 /// </summary>
 public partial class LogView : UserControl
 {
-
     public LogView()
     {
         InitializeComponent();
     }
+
+    private void CollectionViewSource_Filter(object sender, System.Windows.Data.FilterEventArgs e)
+    {
+        var row = e.Item as ILogMessage;
+        e.Accepted = row.Level.Ordinal >= 2;
+    }
 }
diff --git a/Wabbajack.App.Wpf/Views/Installers/InstallationView.xaml.cs b/Wabbajack.App.Wpf/Views/Installers/InstallationView.xaml.cs
@@ -88,10 +88,6 @@ public InstallationView()
                          switch(result)
                          {
                              case InstallResult.DownloadFailed:
-                                 /*
-                                 this.BindCommand(ViewModel, vm => vm.OpenInstallFolderCommand, v => v.StoppedButton)
-                                     .DisposeWith(disposables);
-                                 */
                                  StoppedButton.Command = ViewModel.OpenMissingArchivesCommand;
                                  StoppedButton.Icon = Symbol.DocumentGlobe;
                                  StoppedButton.Text = "Show Missing Archives";
@@ -142,7 +138,7 @@ public InstallationView()
                      .Subscribe(x =>
                      {
                          InstallationLocationPicker.Watermark = x;
-                         if (ViewModel?.Installer?.Location != null)
+                         if (string.IsNullOrEmpty(ViewModel?.Installer?.Location?.TargetPath.ToString()))
                              ViewModel.Installer.Location.TargetPath = (AbsolutePath)x;
                      })
                     .DisposeWith(disposables);
@@ -152,7 +148,7 @@ public InstallationView()
                      .Subscribe(x =>
                      {
                          DownloadLocationPicker.Watermark = x;
-                         if (ViewModel?.Installer?.Location != null)
+                         if (string.IsNullOrEmpty(ViewModel?.Installer?.Location?.TargetPath.ToString()))
                              ViewModel.Installer.DownloadLocation.TargetPath = (AbsolutePath)x;
                      })
                     .DisposeWith(disposables);