configured serilog

ZrdJ · Jun 16, 2024 · fbcbc28 · fbcbc28
1 parent fa5edbb
commit fbcbc28
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 22 deletions.
diff --git a/Smurftown/App.xaml.cs b/Smurftown/App.xaml.cs
@@ -1,9 +1,6 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using Smurftown.UI.MVVM;
-using Smurftown.UI.MVVM.ViewModel;
-using System.Configuration;
-using System.Data;
+using System.IO;
 using System.Windows;
+using Serilog;
 
 namespace Smurftown
 {
@@ -12,7 +9,17 @@ namespace Smurftown
     /// </summary>
     public partial class App : Application
     {
-
-    }
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            if (!Directory.Exists(Directories.UserPath)) Directory.CreateDirectory(Directories.UserPath);
+
+            using var log = new LoggerConfiguration()
+                .WriteTo.Console()
+                .WriteTo.File(Path.Combine(Directories.UserPath, "smurftown.log"))
+                .CreateLogger();
 
-}
+            log.Information("starting smurftown");
+            base.OnStartup(e);
+        }
+    }
+}
diff --git a/Smurftown/Backend/Gateway/BattlenetAccountGateway.cs b/Smurftown/Backend/Gateway/BattlenetAccountGateway.cs
@@ -11,9 +11,6 @@ namespace Smurftown.Backend.Gateway
     public class BattlenetAccountGateway
     {
         public static readonly BattlenetAccountGateway Instance = new();
-
-        private readonly string _configDirectory = AppDomain.CurrentDomain.BaseDirectory;
-        private readonly string _configFileDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".smurftown");
         private readonly string _configFile;
 
         private readonly IDeserializer _yamlIn = new DeserializerBuilder()
@@ -26,7 +23,7 @@ public class BattlenetAccountGateway
 
         private BattlenetAccountGateway()
         {
-            _configFile = Path.Combine(_configFileDirectory, "data.yaml");
+            _configFile = Path.Combine(Directories.UserPath, "data.yaml");
             foreach (var account in ReadFromConfigFile())
             {
                 BattlenetAccounts.Add(account);
@@ -115,8 +112,10 @@ private void ensureConfigFileExists()
         {
             if (!File.Exists(_configFile))
             {
-                Directory.CreateDirectory(_configFileDirectory);
-                using (File.Create(_configFile)) { }
+                Directory.CreateDirectory(Directories.UserPath);
+                using (File.Create(_configFile))
+                {
+                }
             }
         }
 

diff --git a/Smurftown/Backend/Gateway/WindowsAccountGateway.cs b/Smurftown/Backend/Gateway/WindowsAccountGateway.cs
@@ -3,6 +3,7 @@
 using System.DirectoryServices.AccountManagement;
 using System.IO;
 using System.Management;
+using Serilog;
 using Smurftown.Backend.Entity;
 
 namespace Smurftown.Backend.Gateway
@@ -81,7 +82,8 @@ public async Task OpenBattlenet(BattlenetAccount account)
             var command = account.DedicatedWindowsUser
                 ? $"{_psExecExecutable} -accepteula -u {windowsUser.Name} -p {windowsUser.Name} \"{programPath}\""
                 : $"\"{programPath}\"";
-            Console.WriteLine(command);
+            Log.Information($"{account.Battletag()}: starting battlenet");
+            Log.Information($"{account.Battletag()}: executing '{command}'");
             var startInfo = new ProcessStartInfo
             {
                 FileName = "cmd.exe",
@@ -96,19 +98,14 @@ public async Task OpenBattlenet(BattlenetAccount account)
             using (var process = new Process())
             {
                 process.StartInfo = startInfo;
-                Console.WriteLine("Starting process");
                 process.Start();
 
-                Console.WriteLine("Waiting for 500 ms");
                 await Task.Delay(500);
 
                 // Kill the process if it's still running
-                Console.WriteLine("Checking if process is finished: " + process.HasExited);
                 if (!process.HasExited)
                 {
-                    Console.WriteLine("Killing process..");
                     process.Kill();
-                    Console.WriteLine("Killing process.. DONE!");
                 }
             }
         }

diff --git a/Smurftown/Directories.cs b/Smurftown/Directories.cs
@@ -0,0 +1,9 @@
+using System.IO;
+
+namespace Smurftown;
+
+public abstract class Directories
+{
+    public static readonly string UserPath =
+        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".smurftown");
+}
diff --git a/Smurftown/Smurftown.csproj b/Smurftown/Smurftown.csproj
@@ -27,7 +27,12 @@
 
   <ItemGroup>
       <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24306.7"/>
       <PackageReference Include="MvvmDialogs" Version="9.1.2" />
+      <PackageReference Include="Serilog" Version="4.0.0"/>
+      <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.1-dev-10391"/>
+      <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
+      <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00972"/>
       <PackageReference Include="System.DirectoryServices" Version="9.0.0-preview.4.24266.19" />
       <PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.0-preview.4.24266.19" />
     <PackageReference Include="System.Management" Version="8.0.0" />

diff --git a/SmurftownInstaller/Package.appxmanifest b/SmurftownInstaller/Package.appxmanifest
@@ -52,7 +52,6 @@
     </Applications>
 
     <Capabilities>
-        <Capability Name="internetClient"/>
         <rescap:Capability Name="runFullTrust"/>
         <iot:Capability Name="systemManagement"/>
     </Capabilities>

diff --git a/SmurftownInstaller/SmurftownInstaller.assets.cache b/SmurftownInstaller/SmurftownInstaller.assets.cache
diff --git a/SmurftownInstaller/SmurftownInstaller.wapproj b/SmurftownInstaller/SmurftownInstaller.wapproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
+    <VisualStudioVersion>15.0</VisualStudioVersion>    
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x86">
@@ -173,7 +173,11 @@
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" PrivateAssets="all" />
+    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Smurftown\Smurftown.csproj" />