Merge pull request 'adding more logging' (#51) from waffle.lord/SPT-AKI-Installer:even-more-logging into master

Reviewed-on: CWX/SPT-AKI-Installer#51

.idea/.idea.SPTInstaller/.idea/avalonia.xml

@@ -4,10 +4,12 @@
     <option name="projectPerEditor">
       <map>
         <entry key="SPTInstaller/App.axaml" value="SPTInstaller/SPTInstaller.csproj" />
+        <entry key="SPTInstaller/Assets/Styles.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/CustomControls/DetailedPreCheckItem.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/CustomControls/PreCheckItem.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/CustomControls/SPTInstallButton.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/Views/DetailedPreChecksView.axaml" value="SPTInstaller/SPTInstaller.csproj" />
+        <entry key="SPTInstaller/Views/MainWindow.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/Views/PreChecksView.axaml" value="SPTInstaller/SPTInstaller.csproj" />
       </map>
     </option>

SPTInstaller/App.axaml

@@ -40,5 +40,9 @@
 					  />
         <PathGeometry x:Key="Cache" Figures="M 5.4515409 18.707476 C 2.8719183 18.411612 0.6356275 17.508046 0.12886774 16.556868 0.011421 16.336424 0 16.17685 0 14.75659 v -1.558391 l 0.20348761 0.163959 c 0.89061819 0.717606 2.90294209 1.394851 4.91765599 1.655024 1.0475327 0.135279 3.5115239 0.155131 4.4933927 0.03621 2.1668367 -0.262447 3.9985147 -0.826312 5.0629357 -1.558573 l 0.322527 -0.221877 v 1.524757 c 0 1.755973 -0.0041 1.772626 -0.56529 2.263709 -0.796666 0.697209 -2.144167 1.203544 -4.0933 1.53809 -0.5767809 0.099 -1.1020996 0.129287 -2.5440527 0.146688 -0.9994482 0.01206 -2.0550657 -0.0054 -2.3458154 -0.0387 z M 7.8601306 17.28745 c 0.0527 -0.04941 0.095816 -0.193581 0.095816 -0.320366 0 -0.405037 -0.46603 -0.61585 -0.7533032 -0.340767 -0.1321068 0.126504 -0.1782781 0.469731 -0.081588 0.606525 0.1545094 0.218594 0.5342719 0.246654 0.7390756 0.05461 z M 5.5458634 17.092351 c 0.075327 -0.0917 0.1369546 -0.21599 0.1369546 -0.276208 0 -0.203883 -0.2583299 -0.442927 -0.478668 -0.442927 -0.2881074 0 -0.4464405 0.159294 -0.4464405 0.449148 0 0.424533 0.5160004 0.601292 0.7881539 0.269987 z m 4.7625076 0.04017 c 0.07342 -0.0703 0.132157 -0.210917 0.132157 -0.316377 0 -0.105459 -0.05874 -0.24607 -0.132157 -0.316375 -0.07342 -0.0703 -0.220267 -0.126552 -0.3303979 -0.126552 -0.1101318 0 -0.2569762 0.05625 -0.3303975 0.126552 -0.073421 0.0703 -0.1321569 0.210916 -0.1321569 0.316375 0 0.10546 0.058738 0.246072 0.1321569 0.316377 0.073421 0.07031 0.2202657 0.126551 0.3303975 0.126551 0.1101309 0 0.2569759 -0.05624 0.3303979 -0.126551 z M 6.4427306 14.219282 C 3.438293 14.06843 0.69941831 13.09766 0.13645011 11.98407 0.00570426 11.725447 -0.00143606 11.622911 0.01527712 10.244516 L 0.03303424 8.7797875 0.36343157 9.0065262 C 2.6575042 10.580863 7.8536269 11.112097 11.747571 10.170399 12.962111 9.8766787 13.852599 9.520745 14.620039 9.0222575 l 0.379955 -0.2467994 v 1.4852079 c 0 0.822685 -0.02906 1.558392 -0.06514 1.649265 -0.108197 0.272498 -0.66301 0.788548 -1.121691 1.043315 -1.168844 0.64922 -3.065811 1.13473 -4.8263882 1.235267 -1.2569769 0.07178 -1.6359325 0.07636 -2.5440532 0.03076 z m 1.4159088 -1.492928 c 0.075324 -0.0917 0.1369543 -0.215989 0.1369543 -0.276207 0 -0.203883 -0.2583318 -0.442926 -0.4786675 -0.442926 -0.2881093 0 -0.4464425 0.159291 -0.4464425 0.449146 0 0.424534 0.5160019 0.601293 0.7881557 0.269987 z m -2.29146 -0.159368 c 0.1618895 -0.183199 0.1439776 -0.411835 -0.046556 -0.594283 -0.3090962 -0.29598 -0.7629143 -0.107341 -0.7629143 0.317126 0 0.426014 0.5204584 0.604217 0.8094703 0.277157 z m 4.6992386 0.06839 c 0.12628 -0.09512 0.17411 -0.18946 0.17411 -0.343424 0 -0.232297 -0.242217 -0.474564 -0.4744705 -0.474564 -0.1820319 0 -0.4506387 0.282868 -0.4506387 0.474564 0 0.191699 0.2686068 0.474567 0.4506387 0.474567 0.069437 0 0.2046015 -0.05901 0.3003605 -0.131143 z M 5.9140951 9.6877494 C 3.2886712 9.3885406 1.5607385 8.8497481 0.58264334 8.0253262 0.03362115 7.5625637 0 7.4352112 0 5.8183118 V 4.4150124 L 0.30935351 4.6411272 C 1.3355178 5.3911787 3.3497821 5.9987632 5.5506611 6.2221182 6.7548513 6.3443244 9.00242 6.3139162 10.077093 6.1608788 12.027869 5.8830787 13.636 5.3630162 14.620197 4.6916622 14.792913 4.5738469 14.949026 4.4774523 14.967113 4.4774523 14.985194 4.4774523 15 5.1050107 15 5.8720299 15 7.4791794 14.982469 7.5435731 14.411053 8.0355275 13.533871 8.7907237 11.69734 9.3913644 9.5158238 9.6365256 8.7752594 9.71975 6.4811675 9.7523775 5.9140951 9.6877506 Z M 7.7751038 8.4969125 C 8.1763294 8.227805 7.8985219 7.5555425 7.4323869 7.6675706 7.1999381 7.7234394 7.0703688 7.8802994 7.071495 8.104485 7.072745 8.3355694 7.11687 8.4143437 7.3017606 8.5147362 7.4816994 8.6124437 7.610055 8.6076106 7.7751038 8.4969175 Z M 5.5458634 8.2338012 C 5.6211901 8.1421037 5.682818 8.0178119 5.682818 7.9575956 c 0 -0.1899694 -0.2585097 -0.4429287 -0.4526467 -0.4429287 -0.2913367 0 -0.4724618 0.1632037 -0.4724618 0.425715 0 0.2931318 0.1578686 0.4601406 0.4349596 0.4601406 0.154904 0 0.2550881 -0.047287 0.3531943 -0.1667213 z m 4.7625076 0.040175 c 0.07342 -0.070305 0.132157 -0.2109162 0.132157 -0.316375 0 -0.1054612 -0.05874 -0.2460718 -0.132157 -0.3163775 -0.286005 -0.2738662 -0.7929522 -0.071601 -0.7929522 0.3163775 0 0.1054588 0.058737 0.2460694 0.1321568 0.316375 0.073421 0.070304 0.2202657 0.1265519 0.3303975 0.1265519 0.1101309 0 0.2569759 -0.056244 0.3303979 -0.1265519 z M 6.178414 5.3866444 C 3.8630228 5.2033161 2.0080132 4.6795372 0.82192238 3.8741859 0.26331487 3.4948944 0.03303924 3.1533125 0.03303924 2.7039893 c 0 -0.2939821 0.03374352 -0.3937029 0.21156697 -0.6252455 C 1.4428273 0.518552 5.8324898 -0.36375235 9.8724944 0.14357696 12.82408 0.51422624 14.999999 1.6015126 14.999999 2.7057413 c 0 1.1212199 -2.227472 2.2145851 -5.2863421 2.5948303 C 9.1252344 5.3737159 6.74658 5.4316311 6.178414 5.3866444 Z" FillRule="NonZero"
                       />
+        <PathGeometry x:Key="Bug"
+                      Figures="m 12.25 0 a 0.75 0.75 0 0 1 0.743 0.648 L 13 0.75 v 0.752 c 0 0.633 -0.196 1.22 -0.53 1.704 a 3.75 3.75 0 0 1 2.521 3.29 h 0.256 a 2.25 2.25 0 0 0 2.24 -2.259 L 17.481 2.752 a 0.750006 0.750006 0 0 1 1.5 -0.006 l 0.007 1.485 a 3.75 3.75 0 0 1 -3.536 3.76 L 15.238 7.997 L 15 7.996 v 1.502 h 4.253 a 0.75 0.75 0 0 1 0.743 0.649 l 0.007 0.102 a 0.75 0.75 0 0 1 -0.648 0.743 l -0.102 0.007 H 15 v 1.999 h 0.238 l 0.214 0.007 a 3.75 3.75 0 0 1 3.531 3.56 l 0.005 0.2 l -0.007 1.485 a 0.75 0.75 0 0 1 -1.493 0.095 l -0.007 -0.102 l 0.007 -1.485 a 2.25 2.25 0 0 0 -2.087 -2.253 l -0.154 -0.006 h -0.476 a 5.002 5.002 0 0 1 -9.542 0 H 4.74 A 2.25 2.25 0 0 0 2.5 16.758 l 0.005 1.485 a 0.750008 0.750008 0 1 1 -1.5 0.007 L 1 16.764 a 3.75 3.75 0 0 1 3.535 -3.76 L 4.75 12.999 L 5 12.998 v -2 H 0.75 A 0.75 0.75 0 0 1 0.007 10.35 L 0 10.249 A 0.75 0.75 0 0 1 0.648 9.506 L 0.75 9.499 L 5 9.498 V 7.996 H 4.75 L 4.535 7.991 A 3.75 3.75 0 0 1 1.005 4.431 L 1 4.23 L 1.006 2.745 A 0.75 0.75 0 0 1 2.5 2.649 L 2.506 2.751 L 2.5 4.237 A 2.25 2.25 0 0 0 4.587 6.491 L 4.741 6.497 H 5.009 A 3.753 3.753 0 0 1 7.53 3.205 A 2.968 2.968 0 0 1 7.006 1.711 L 7 1.502 V 0.75 A 0.75 0.75 0 0 1 8.493 0.648 L 8.5 0.75 v 0.752 a 1.5 1.5 0 0 0 2.993 0.145 L 11.5 1.502 V 0.75 A 0.75 0.75 0 0 1 12.25 0 Z"
+                      FillRule="NonZero"
+                      />
 	</Application.Resources>
 </Application>

SPTInstaller/App.axaml.cs

@@ -12,17 +12,16 @@ namespace SPTInstaller;
 
 public partial class App : Application
 {
+    private readonly string _logPath = Path.Join(Environment.CurrentDirectory, "spt-aki-installer_.log");
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
         
-        var logPath = Path.Join(Environment.CurrentDirectory, "spt-aki-installer_.log");
-
         Log.Logger = new LoggerConfiguration()
-            .MinimumLevel.Debug()
+            .MinimumLevel.Information()
             .WriteTo
-            .File(path: logPath,
+            .File(path: _logPath,
-                restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Debug,
+                restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Information,
                 rollingInterval: RollingInterval.Day)
             .CreateLogger();
 
@@ -37,15 +36,25 @@ public partial class App : Application
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            if (desktop.Args != null && desktop.Args.Any(x => x.ToLower() == "debug"))
+            var debug = desktop.Args != null && desktop.Args.Any(x => x.ToLower() == "debug");
+            if (debug)
             {
+                Log.Logger = new LoggerConfiguration()
+                    .MinimumLevel.Debug()
+                    .WriteTo
+                    .File(path: _logPath,
+                        restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Debug,
+                        rollingInterval: RollingInterval.Day)
+                    .CreateLogger();
+                
                 System.Diagnostics.Trace.Listeners.Add(new SerilogTraceListener.SerilogTraceListener());
+                
                 Log.Debug("TraceListener is registered");
             }
             
             desktop.MainWindow = new MainWindow
             {
-                DataContext = new MainWindowViewModel(),
+                DataContext = new MainWindowViewModel(debug),
             };
         }
 

SPTInstaller/Assets/Styles.axaml

@@ -1,11 +1,14 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cc="using:SPTInstaller.CustomControls"
-        xmlns:rxui="using:Avalonia.ReactiveUI"
         >
 	<Design.PreviewWith>
 		<StackPanel Spacing="5" Background="{StaticResource AKI_Background_Dark}">
-			<Button Content="Blah" Classes="link"/>
+			<Button Classes="icon" x:Name="testBtn">
+                <Path Data="{StaticResource Bug}" 
+                      Fill="{Binding ElementName=testBtn, Path=Foreground}"
+                      />
+            </Button>
 			<TextBox Text="Some cool text here" Margin="5"/>
 			<TextBox Watermark="This is a watermark" Margin="5"/>
 		</StackPanel>
@@ -248,4 +251,21 @@
 		<Setter Property="BorderBrush" Value="Transparent"/>
 		<Setter Property="BorderThickness" Value="0"/>
 	</Style>
+    
+    <!-- Button icon Style -->
+    <Style Selector="Button.icon">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="White"/>
+    </Style>
+    <Style Selector="Button.icon:pointerover">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource AKI_Brush_Yellow}"/>
+    </Style>
+    <Style Selector="Button.icon:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+    </Style>
+    <Style Selector="Button.icon:pressed">
+        <Setter Property="Foreground" Value="{StaticResource AKI_DarkGrayBlue}"></Setter>
+    </Style>
 </Styles>

SPTInstaller/Helpers/FileHelper.cs

@@ -24,6 +24,7 @@ public static class FileHelper
                     if (currentDirRelativePath.StartsWith(exclusion) || currentDirRelativePath == exclusion)
                     {
                         exclude = true;
+                        Log.Debug($"EXCLUSION FOUND :: DIR\nExclusion: '{exclusion}'\nPath: '{currentDirRelativePath}'");
                         break;
                     }
                 }
@@ -62,6 +63,7 @@ public static class FileHelper
                     if (currentFileRelativePath.StartsWith(exclusion) || currentFileRelativePath == exclusion)
                     {
                         exclude = true;
+                        Log.Debug($"EXCLUSION FOUND :: FILE\nExclusion: '{exclusion}'\nPath: '{currentFileRelativePath}'");
                         break;
                     }
                 }
@@ -69,7 +71,12 @@ public static class FileHelper
                 if (exclude)
                     continue;
 
-                File.Copy(file.FullName, file.FullName.Replace(sourceDir.FullName, targetDir.FullName), true);
+                
+                var targetFile = file.FullName.Replace(sourceDir.FullName, targetDir.FullName);
+                
+                Log.Debug($"COPY\nSourceDir: '{sourceDir.FullName}'\nTargetDir: '{targetDir.FullName}'\nNewPath: '{targetFile}'");
+
+                File.Copy(file.FullName, targetFile, true);
                 processedFiles++;
             }
 

SPTInstaller/SPTInstaller.csproj

@@ -9,8 +9,8 @@
     <PackageIcon>icon.ico</PackageIcon>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
     <Configurations>Debug;Release;TEST</Configurations>
-    <AssemblyVersion>2.29</AssemblyVersion>
+    <AssemblyVersion>2.30</AssemblyVersion>
-    <FileVersion>2.29</FileVersion>
+    <FileVersion>2.30</FileVersion>
     <Company>SPT-AKI</Company>
   </PropertyGroup>
 

SPTInstaller/ViewModels/DetailedPreChecksViewModel.cs

@@ -3,7 +3,7 @@
 namespace SPTInstaller.ViewModels;
 public class DetailedPreChecksViewModel : PreChecksViewModel
 {
-    public DetailedPreChecksViewModel(IScreen host) : base(host)
+    public DetailedPreChecksViewModel(IScreen host, bool debugging) : base(host, debugging)
     {
     }
 }

SPTInstaller/ViewModels/MainWindowViewModel.cs

@@ -19,11 +19,11 @@ public class MainWindowViewModel : ReactiveObject, IActivatableViewModel, IScree
         set => this.RaiseAndSetIfChanged(ref _title, value);
     }
 
-    public MainWindowViewModel()
+    public MainWindowViewModel(bool debugging)
     {
         Configuration.Default.BasePath = "https://dev.sp-tarkov.com/api/v1";
 
-        Title = $"SPT Installer {"v" + Assembly.GetExecutingAssembly().GetName()?.Version?.ToString() ?? "--unknown version--"}";
+        Title = $"{(debugging ? "-debug-" : "")} SPT Installer {"v" + Assembly.GetExecutingAssembly().GetName()?.Version?.ToString() ?? "--unknown version--"}";
 
         Log.Information($"========= {Title} Started =========");
         Log.Information(Environment.OSVersion.VersionString);
@@ -32,7 +32,7 @@ public class MainWindowViewModel : ReactiveObject, IActivatableViewModel, IScree
 
         Log.Information("System Language: {iso} - {name}", uiCulture.TwoLetterISOLanguageName, uiCulture.DisplayName);
 
-        Router.Navigate.Execute(new PreChecksViewModel(this));
+        Router.Navigate.Execute(new PreChecksViewModel(this, debugging));
     }
 
     public void CloseCommand()

SPTInstaller/ViewModels/PreChecksViewModel.cs

@@ -1,8 +1,8 @@
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using Avalonia.Controls;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using Gitea.Api;
@@ -27,8 +27,18 @@ public class PreChecksViewModel : ViewModelBase
 
     public ICommand DismissUpdateCommand { get; set; }
     
+    public ICommand LaunchWithDebug { get; set; }
+
     public InstallerUpdateInfo UpdateInfo { get; set; } = new();
 
+    private bool _debugging;
+
+    public bool Debugging
+    {
+        get => _debugging;
+        set => this.RaiseAndSetIfChanged(ref _debugging, value);
+    }
+
     private string _installPath;
     public string InstallPath
     {
@@ -91,8 +101,9 @@ public class PreChecksViewModel : ViewModelBase
         });
     }
 
-    public PreChecksViewModel(IScreen host) : base(host)
+    public PreChecksViewModel(IScreen host, bool debugging) : base(host)
     {
+        Debugging = debugging;
         var data = ServiceHelper.Get<InternalData?>();
         var installer = ServiceHelper.Get<InstallController?>();
 
@@ -162,6 +173,25 @@ public class PreChecksViewModel : ViewModelBase
             }
         });
 
+        LaunchWithDebug = ReactiveCommand.Create(async () =>
+        {
+            try
+            {
+                var installerPath = Path.Join(_installPath, "SPTInstaller.exe");
+                Process.Start(new ProcessStartInfo()
+                {
+                    FileName = installerPath,
+                    Arguments = "debug"
+                });
+
+                Environment.Exit(0);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to enter debug mode");
+            }
+        });
+
         StartInstallCommand = ReactiveCommand.Create(async () =>
         {
             UpdateInfo.ShowCard = false;
@@ -173,7 +203,7 @@ public class PreChecksViewModel : ViewModelBase
             UpdateInfo.ShowCard = false;
             Log.Logger.Information("Opening Detailed PreCheck View");
             installer.RecheckRequested -= ReCheckRequested;
-            NavigateTo(new DetailedPreChecksViewModel(HostScreen));
+            NavigateTo(new DetailedPreChecksViewModel(HostScreen, Debugging));
         });
 
         UpdateInstallerCommand = ReactiveCommand.Create(async () =>

SPTInstaller/Views/PreChecksView.axaml

@@ -70,5 +70,15 @@
                       VerticalAlignment="Bottom" HorizontalAlignment="Left"
                       InfoText="{Binding CacheInfoText}" State="{Binding CacheCheckState}"
                       />
+        
+        <Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" Padding="10" x:Name="debugBtn"
+                HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                Classes="icon"
+                Command="{Binding LaunchWithDebug}"
+                IsVisible="{Binding !Debugging}"
+                >
+            <Path Data="{StaticResource Bug}" Fill="{Binding ElementName=debugBtn, Path=Foreground}"
+                  />
+        </Button>
 	</Grid>
 </UserControl>