Merge pull request #669 from dremin/misc-updates

Misc updates
dremin · Aug 30, 2023 · 2a213ee · 2a213ee
2 parents e6dd912 + 575ff87
commit 2a213ee
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -69,6 +69,7 @@ RetroBar is based on the [ManagedShell](https://github.com/cairoshell/ManagedShe
 - Korean (한국어)
 - Latvian (latviešu)
 - Lithuanian (lietuvių)
+- Luxembourgish (Lëtzebuergesch)
 - Malay (Melayu)
 - Persian (فارسی)
 - Polish (polski)

diff --git a/RetroBar/RetroBar.csproj b/RetroBar/RetroBar.csproj
@@ -45,7 +45,7 @@
 
   <ItemGroup>
     <PackageReference Include="gong-wpf-dragdrop" Version="3.1.1" />
-    <PackageReference Include="ManagedShell" Version="0.0.212" />
+    <PackageReference Include="ManagedShell" Version="0.0.223" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/RetroBar/Utilities/ManagedShellLogger.cs b/RetroBar/Utilities/ManagedShellLogger.cs
@@ -56,6 +56,12 @@ private void DeleteOldLogFiles()
         {
             try
             {
+                if (!Directory.Exists(_logPath))
+                {
+                    // Nothing to delete
+                    return;
+                }
+
                 // look for all of the log files
                 DirectoryInfo info = new DirectoryInfo(_logPath);
                 FileInfo[] files = info.GetFiles($"*.{_logExt}", SearchOption.TopDirectoryOnly);

diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
@@ -1,6 +1,8 @@
 using ManagedShell.AppBar;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Runtime.CompilerServices;
 
 namespace RetroBar.Utilities
@@ -23,8 +25,9 @@ public static Settings Instance
             }
         }
 
+        private static string _settingsPath = Path.Combine(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "RetroBar"), "settings.json");
         private static bool _isInitializing = true;
-        private static SettingsManager<Settings> _settingsManager = new SettingsManager<Settings>(new Settings());
+        private static SettingsManager<Settings> _settingsManager = new SettingsManager<Settings>(_settingsPath, new Settings());
 
         public event PropertyChangedEventHandler PropertyChanged;
 

diff --git a/RetroBar/Utilities/SettingsManager.cs b/RetroBar/Utilities/SettingsManager.cs
@@ -10,10 +10,10 @@ namespace RetroBar.Utilities
 {
     public class SettingsManager<T> : INotifyPropertyChanged
     {
-        private string _fileName = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\RetroBar\\settings.json";
-
         public event PropertyChangedEventHandler PropertyChanged;
 
+        private string _fileName;
+
         private T _settings;
         public T Settings
         {
@@ -27,8 +27,9 @@ public T Settings
             }
         }
 
-        public SettingsManager(T defaultSettings)
+        public SettingsManager(string fileName, T defaultSettings)
         {
+            _fileName = fileName;
             _settings = defaultSettings;
 
             if (!loadFromFile())
@@ -67,6 +68,11 @@ private void saveToFile()
 
             try
             {
+                if (!Directory.Exists(Path.GetDirectoryName(_fileName)))
+                {
+                    Directory.CreateDirectory(Path.GetDirectoryName(_fileName));
+                }
+
                 string jsonString = JsonSerializer.Serialize(Settings, options);
                 File.WriteAllText(_fileName, jsonString);
             }