Show details about JSON error if theme fails to load

t1m0thyj · May 27, 2020 · 44ccd6c · 44ccd6c
1 parent e2cafab
commit 44ccd6c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 46 deletions.
diff --git a/src/JsonConfig.cs b/src/JsonConfig.cs
@@ -43,20 +43,6 @@ public class AppConfig : INotifyPropertyChanged
         public bool fullScreenPause { get; set; }
         public bool enableScripts { get; set; }
     }
-
-    public class ThemeConfig
-    {
-        public string themeId { get; set; }
-        public string displayName { get; set; }
-        public string imageFilename { get; set; }
-        public string imageCredits { get; set; }
-        public int? dayHighlight { get; set; }
-        public int? nightHighlight { get; set; }
-        public int[] sunriseImageList { get; set; }
-        public int[] dayImageList { get; set; }
-        public int[] sunsetImageList { get; set; }
-        public int[] nightImageList { get; set; }
-    }
 #nullable restore
 
     class JsonConfig
@@ -101,24 +87,6 @@ public static void LoadConfig()
             autoSaveTimer.Elapsed += OnAutoSaveTimerElapsed;
         }
 
-        public static ThemeConfig LoadTheme(string name)
-        {
-            ThemeConfig theme;
-            string jsonText = File.ReadAllText(Path.Combine("themes", name, "theme.json"));
-
-            try
-            {
-                theme = JsonConvert.DeserializeObject<ThemeConfig>(jsonText);
-            }
-            catch (JsonException)
-            {
-                return null;
-            }
-
-            theme.themeId = name;
-            return theme;
-        }
-
         public static void ReloadConfig()
         {
             restartPending = true;

diff --git a/src/ThemeError.cs b/src/ThemeError.cs
@@ -56,9 +56,9 @@ public InvalidImageInThemeJSON(string themeId, int imageId, string filename) : b
 
     class InvalidThemeJSON : ThemeError
     {
-        public InvalidThemeJSON(string themeId) : base(themeId)
+        public InvalidThemeJSON(string themeId, string message) : base(themeId)
         {
-            errorMsg = _("Could not read theme JSON file because its format is invalid");
+            errorMsg = string.Format(_("Could not read theme JSON file: {0}"), message);
         }
     }
 

diff --git a/src/ThemeLoader.cs b/src/ThemeLoader.cs
@@ -10,33 +10,53 @@
 using System.IO;
 using System.IO.Compression;
 using System.Windows.Forms;
+using Newtonsoft.Json;
 
 namespace WinDynamicDesktop
 {
+#nullable disable
+    public class ThemeConfig
+    {
+        public string themeId { get; set; }
+        public string displayName { get; set; }
+        public string imageFilename { get; set; }
+        public string imageCredits { get; set; }
+        public int? dayHighlight { get; set; }
+        public int? nightHighlight { get; set; }
+        public int[] sunriseImageList { get; set; }
+        public int[] dayImageList { get; set; }
+        public int[] sunsetImageList { get; set; }
+        public int[] nightImageList { get; set; }
+    }
+#nullable restore
+
     class ThemeLoader
     {
         private static readonly Func<string, string> _ = Localization.GetTranslation;
         public static IntPtr taskbarHandle = IntPtr.Zero;
 
         public static ThemeResult TryLoad(string themeId)
         {
-            if (!File.Exists(Path.Combine("themes", themeId, "theme.json")))
+            string jsonPath = Path.Combine("themes", themeId, "theme.json");
+
+            if (!File.Exists(jsonPath))
             {
                 return new ThemeResult(new NoThemeJSON(themeId));
             }
-            else
-            {
-                ThemeConfig theme = JsonConfig.LoadTheme(themeId);
 
-                if (theme == null)
-                {
-                    return new ThemeResult(new InvalidThemeJSON(themeId));
-                }
-                else
-                {
-                    return ThemeJsonValidator.ValidateQuick(theme);
-                }
+            ThemeConfig theme;
+
+            try
+            {
+                theme = JsonConvert.DeserializeObject<ThemeConfig>(File.ReadAllText(jsonPath));
+            }
+            catch (JsonException e)
+            {
+                return new ThemeResult(new InvalidThemeJSON(themeId, e.Message));
             }
+
+            theme.themeId = themeId;
+            return ThemeJsonValidator.ValidateQuick(theme);
         }
 
         public static void HandleError(ThemeError e)