♻️ Move Logs output directory from Program Files to AppData

TheHeadmaster · Sep 21, 2020 · 7dc0c43 · 7dc0c43
1 parent 8468903
commit 7dc0c43
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/Quartz.Core/Diagnostics/LogManager.cs b/Quartz.Core/Diagnostics/LogManager.cs
@@ -49,11 +49,11 @@ public static void Initialize()
             {
                 DateTime dt = DateTime.UtcNow;
                 string filename = $"{dt.Month}-{dt.Day}-{dt.Year} {dt.Hour}-{dt.Minute}-{dt.Second}";
-                logPath = Path.Combine(AppMeta.AssemblyDirectory, "Logs", $"{filename}.json");
+                logPath = Path.Combine(AppMeta.AppDataDirectory, "Logs", $"{filename}.json");
             }
-            if (!Directory.Exists(Path.Combine(AppMeta.AssemblyDirectory, "Logs")))
+            if (!Directory.Exists(Path.Combine(AppMeta.AppDataDirectory, "Logs")))
             {
-                Directory.CreateDirectory(Path.Combine(AppMeta.AssemblyDirectory, "Logs"));
+                Directory.CreateDirectory(Path.Combine(AppMeta.AppDataDirectory, "Logs"));
             }
 
             Log.Logger = new LoggerConfiguration()

diff --git a/Quartz.IDE/App.xaml.cs b/Quartz.IDE/App.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -66,13 +67,25 @@ private static void EnterProgram()
 
             Locator.CurrentMutable.RegisterViewsForViewModels(Assembly.GetCallingAssembly());
 
-            Metadata = JFile.Load<PreferencesFile>(Metadata.AppDataDirectory, "metadata.json").CreateModel();
-            Metadata.Save();
-            Preferences.Load();
-
             new MainWindow().Show();
         }
 
+        /// <summary>
+        /// Loads the Preferences from disk or creates default preferences if none exists.
+        /// </summary>
+        [Log("Initializing Preferences...")]
+        private static void InitializePreferences()
+        {
+            if (!Directory.Exists(Path.Combine(AppMeta.AppDataDirectory, "metadata.json")))
+            {
+                Directory.CreateDirectory(Path.Combine(AppMeta.AppDataDirectory, "metadata.json"));
+            }
+
+            Preferences = JFile.Load<PreferencesFile>(Metadata.AppDataDirectory, "metadata.json").CreateModel();
+            Preferences.Save();
+            Preferences.Load();
+        }
+
         /// <summary>
         /// Initializes the logging manager and logs the welcome messages.
         /// </summary>