From e9ed2c01e6ee18435f9b62d45516ad75b2d2e327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= <kovacsadam07@outlook.hu>
Date: Mon, 30 May 2022 10:47:57 +0200
Subject: [PATCH] Program.cs refactor

---
 .../Avalonia/FileTime.GuiApp.App/Program.cs   | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs
index bc41944..32740af 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using Avalonia;
 using Avalonia.ReactiveUI;
 
@@ -7,16 +9,26 @@ namespace FileTime.GuiApp.App;
 
 public static class Program
 {
-    public static string AppDataRoot { get; }
-    public static string EnvironmentName { get; }
+    public static string AppDataRoot { get; private set; }
+    public static string EnvironmentName { get; private set; }
 
     static Program()
     {
 #if DEBUG
-        EnvironmentName = "Development";
-
-        AppDataRoot = Path.Combine(Environment.CurrentDirectory, "appdata");
+        InitDevelopment();
 #else
+        InitRelease();
+#endif
+
+        void InitDevelopment()
+        {
+            EnvironmentName = "Development";
+
+            AppDataRoot = Path.Combine(Environment.CurrentDirectory, "appdata");
+        }
+
+        void InitRelease()
+        {
             EnvironmentName = "Release";
 
             var possibleDataRootsPaths = new List<string>()
@@ -37,12 +49,13 @@ public static class Program
                     appDataRoot = possibleAppDataRoot;
                     break;
                 }
-                catch { }
+                catch
+                {
+                }
             }
 
-            if (appDataRoot == null) throw new UnauthorizedAccessException();
-            AppDataRoot = appDataRoot;
-#endif
+            AppDataRoot = appDataRoot ?? throw new UnauthorizedAccessException();
+        }
     }
 
     // Initialization code. Don't use any Avalonia, third-party APIs or any