Merge pull request #566 from domialex/bugfix-userdata

Use LocalApplicationData path instead of the executable's path
domialex · Apr 18, 2021 · 06623fa · 06623fa
2 parents 84fa8c4 + 648a9c0
commit 06623fa
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 23 deletions.
diff --git a/src/Sidekick.Application/Settings/SaveSettingsHandler.cs b/src/Sidekick.Application/Settings/SaveSettingsHandler.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Reflection;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -49,7 +48,7 @@ public async Task<Unit> Handle(SaveSettingsCommand request, CancellationToken ca
 
             var json = JsonSerializer.Serialize(settings);
             var defaults = JsonSerializer.Serialize(new SidekickSettings());
-            var filePath = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), FileName);
+            var filePath = SidekickPaths.GetDataFilePath(FileName);
 
             using var fileStream = File.Create(filePath);
             using var writer = new Utf8JsonWriter(fileStream, options: new JsonWriterOptions

diff --git a/src/Sidekick.Extensions/SidekickPaths.cs b/src/Sidekick.Extensions/SidekickPaths.cs
@@ -0,0 +1,16 @@
+using System;
+using System.IO;
+
+namespace Sidekick.Extensions
+{
+    public static class SidekickPaths
+    {
+        public static string GetDataFilePath(string fileName)
+        {
+            // Possible solution for cross platform support
+            // var folderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+
+            return Path.Combine(Environment.ExpandEnvironmentVariables("%AppData%\\sidekick"), fileName);
+        }
+    }
+}
diff --git a/src/Sidekick.Logging/StartupExtensions.cs b/src/Sidekick.Logging/StartupExtensions.cs
@@ -1,11 +1,11 @@
-using System.IO;
-using System.Reflection;
+using System;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Sentry;
 using Serilog;
 using Sidekick.Domain.Settings;
+using Sidekick.Extensions;
 
 namespace Sidekick.Logging
 {
@@ -14,13 +14,15 @@ public static class StartupExtensions
     {
         public static IServiceCollection AddSidekickLogging(this IServiceCollection services, IConfiguration configuration, IHostEnvironment environment)
         {
+            var sidekickPath = Environment.ExpandEnvironmentVariables("%AppData%\\sidekick");
+
             var logSink = new LogSink();
 
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", Serilog.Events.LogEventLevel.Information)
                 .Enrich.FromLogContext()
-                .WriteTo.File(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Sidekick_log.log"),
+                .WriteTo.File(SidekickPaths.GetDataFilePath("Sidekick_log.log"),
                     rollingInterval: RollingInterval.Day,
                     retainedFileCountLimit: 1,
                     fileSizeLimitBytes: 5242880,

diff --git a/src/Sidekick.Persistence/SidekickDesignTime.cs b/src/Sidekick.Persistence/SidekickDesignTime.cs
@@ -1,15 +1,15 @@
-using System.IO;
-using System.Reflection;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
+using Sidekick.Extensions;
+
 namespace Sidekick.Persistence
 {
     internal class SidekickDesignTime : IDesignTimeDbContextFactory<SidekickContext>
     {
         public SidekickContext CreateDbContext(string[] args)
         {
             var builder = new DbContextOptionsBuilder<SidekickContext>();
-            var connectionString = "Filename=" + Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "data.db");
+            var connectionString = "Filename=" + SidekickPaths.GetDataFilePath("data.db");
             builder.UseSqlite(connectionString);
             return new SidekickContext(builder.Options);
         }

diff --git a/src/Sidekick.Persistence/StartupExtensions.cs b/src/Sidekick.Persistence/StartupExtensions.cs
@@ -1,11 +1,10 @@
-using System.IO;
-using System.Reflection;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Sidekick.Domain.Apis.PoeNinja;
 using Sidekick.Domain.Cache;
 using Sidekick.Domain.Game.Leagues;
 using Sidekick.Domain.Views;
+using Sidekick.Extensions;
 using Sidekick.Persistence.Apis.PoeNinja;
 using Sidekick.Persistence.Cache;
 using Sidekick.Persistence.ItemCategories;
@@ -18,7 +17,7 @@ public static class StartupExtensions
     {
         public static IServiceCollection AddSidekickPersistence(this IServiceCollection services)
         {
-            var connectionString = "Filename=" + Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "data.db");
+            var connectionString = "Filename=" + SidekickPaths.GetDataFilePath("data.db");
 
             services.AddDbContextPool<SidekickContext>(options => options.UseSqlite(connectionString));
 

diff --git a/src/Sidekick.Presentation.Blazor.Electron/Program.cs b/src/Sidekick.Presentation.Blazor.Electron/Program.cs
@@ -1,10 +1,9 @@
-using System.IO;
-using System.Reflection;
 using ElectronNET.API;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Sidekick.Application.Settings;
+using Sidekick.Extensions;
 
 namespace Sidekick.Presentation.Blazor.Electron
 {
@@ -15,17 +14,19 @@ public static void Main(string[] args)
             CreateHostBuilder(args).Build().Run();
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
+        public static IHostBuilder CreateHostBuilder(string[] args)
+        {
+            return Host.CreateDefaultBuilder(args)
                 .ConfigureAppConfiguration(config =>
                 {
-                    config.AddJsonFile(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), SaveSettingsHandler.FileName), true, true);
+                    config.AddJsonFile(SidekickPaths.GetDataFilePath(SaveSettingsHandler.FileName), true, true);
                 })
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder
                         .UseElectron(args)
                         .UseStartup<Startup>();
                 });
+        }
     }
 }
diff --git a/src/Sidekick.Presentation.Blazor/Program.cs b/src/Sidekick.Presentation.Blazor/Program.cs
@@ -1,9 +1,8 @@
-using System.IO;
-using System.Reflection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Sidekick.Application.Settings;
+using Sidekick.Extensions;
 
 namespace Sidekick.Presentation.Blazor
 {
@@ -14,15 +13,17 @@ public static void Main(string[] args)
             CreateHostBuilder(args).Build().Run();
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
+        public static IHostBuilder CreateHostBuilder(string[] args)
+        {
+            return Host.CreateDefaultBuilder(args)
                 .ConfigureAppConfiguration(config =>
                 {
-                    config.AddJsonFile(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), SaveSettingsHandler.FileName), true, true);
+                    config.AddJsonFile(SidekickPaths.GetDataFilePath(SaveSettingsHandler.FileName), true, true);
                 })
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
                 });
+        }
     }
 }
diff --git a/src/Sidekick.Presentation.Blazor/Startup.cs b/src/Sidekick.Presentation.Blazor/Startup.cs
@@ -9,8 +9,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Sidekick.Application;
+using Sidekick.Application.Settings;
 using Sidekick.Domain.Initialization.Commands;
 using Sidekick.Domain.Platforms;
+using Sidekick.Domain.Settings.Commands;
 using Sidekick.Domain.Views;
 using Sidekick.Infrastructure;
 using Sidekick.Localization;
@@ -105,6 +107,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IService
 
             Task.Run(async () =>
             {
+                await mediator.Send(new SaveSettingsCommand(new SidekickSettings()
+                {
+                    Language_Parser = "en",
+                    Language_UI = "en",
+                    LeagueId = "Ultimatum",
+                }, true));
                 await mediator.Send(new InitializeCommand(true));
             });
         }

diff --git a/tests/Sidekick.Application.Tests/MediatorFixture.cs b/tests/Sidekick.Application.Tests/MediatorFixture.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
 using MediatR;
@@ -11,6 +10,7 @@
 using Sidekick.Domain.Platforms;
 using Sidekick.Domain.Settings.Commands;
 using Sidekick.Domain.Views;
+using Sidekick.Extensions;
 using Sidekick.Infrastructure;
 using Sidekick.Localization;
 using Sidekick.Logging;
@@ -37,7 +37,7 @@ public async Task InitializeAsync()
             var mockEnvironment = new Mock<IHostEnvironment>();
 
             var configuration = new ConfigurationBuilder()
-                .AddJsonFile(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), SaveSettingsHandler.FileName), true, true)
+                .AddJsonFile(SidekickPaths.GetDataFilePath(SaveSettingsHandler.FileName), true, true)
                 .Build();
 
             var services = new ServiceCollection()