From 83029c478f411bcadd3be53ac4dc53d88b3c8462 Mon Sep 17 00:00:00 2001
From: "Emma@Rory&" <root@rory.gay>
Date: Mon, 14 Aug 2023 19:46:33 +0200
Subject: Code cleanup

---
 MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs')

diff --git a/MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs b/MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs
index 39c42cf..4f265ee 100644
--- a/MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs
+++ b/MatrixRoomUtils.Desktop/MRUDesktopConfiguration.cs
@@ -11,7 +11,7 @@ public class MRUDesktopConfiguration {
 
     public MRUDesktopConfiguration(ILogger<MRUDesktopConfiguration> logger, IConfiguration config, HostBuilderContext host) {
         _logger = logger;
-        logger.LogInformation($"Loading configuration for environment: {host.HostingEnvironment.EnvironmentName}...");
+        logger.LogInformation("Loading configuration for environment: {}...", host.HostingEnvironment.EnvironmentName);
         config.GetSection("MRUDesktop").Bind(this);
         DataStoragePath = ExpandPath(DataStoragePath);
         CacheStoragePath = ExpandPath(CacheStoragePath);
@@ -22,18 +22,18 @@ public class MRUDesktopConfiguration {
     public string? SentryDsn { get; set; }
 
     private static string ExpandPath(string path, bool retry = true) {
-        _logger.LogInformation($"Expanding path `{path}`");
+        _logger.LogInformation("Expanding path `{}`", path);
 
         if (path.StartsWith("~")) {
             path = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), path[1..]);
         }
 
-        Environment.GetEnvironmentVariables().Cast<DictionaryEntry>().OrderByDescending(x => x.Key.ToString().Length).ToList().ForEach(x => {
+        Environment.GetEnvironmentVariables().Cast<DictionaryEntry>().OrderByDescending(x => x.Key.ToString()!.Length).ToList().ForEach(x => {
             path = path.Replace($"${x.Key}", x.Value.ToString());
         });
 
-        _logger.LogInformation($"Expanded path to `{path}`");
-        int tries = 0;
+        _logger.LogInformation("Expanded path to `{}`", path);
+        var tries = 0;
         while(retry && path.ContainsAnyOf("~$".Split())) {
             if(tries++ > 100)
                 throw new Exception($"Path `{path}` contains unrecognised environment variables");
-- 
cgit 1.4.1