Added checks to settings.json and watcher.json to rebuild the files if they throw an error on load (corruption, broken, etc)

Author: Iridium-IO

CompactGUI.Watcher/Watcher.vb

@@ -4,6 +4,7 @@ Imports Microsoft.Toolkit.Mvvm.ComponentModel
 Imports CompactGUI.Core
 Imports System.Threading
 Imports System.Collections.Specialized
+Imports System.Runtime
 
 Public Class Watcher : Inherits ObservableObject
 
@@ -121,21 +122,33 @@ Public Class Watcher : Inherits ObservableObject
         If Not _DataFolder.Exists Then _DataFolder.Create()
         If Not WatcherJSONFile.Exists Then Await WatcherJSONFile.Create().DisposeAsync()
 
-        Dim WatcherJSON = IO.File.ReadAllText(WatcherJSONFile.FullName)
-        If WatcherJSON = "" Then WatcherJSON = "{}"
-
-        Dim ret = JsonSerializer.Deserialize(Of (DateTime, ObservableCollection(Of WatchedFolder)))(WatcherJSON, New JsonSerializerOptions With {.IncludeFields = True})
+        Dim ret = DeserializeAndValidateJSON(WatcherJSONFile)
         LastAnalysed = ret.Item1
         Dim _WatchedFolders = ret.Item2
 
 
         Return _WatchedFolders
-
     End Function
 
+    Private Shared Function DeserializeAndValidateJSON(inputjsonFile As IO.FileInfo) As (DateTime, ObservableCollection(Of WatchedFolder))
+        Dim WatcherJSON = IO.File.ReadAllText(inputjsonFile.FullName)
+        If WatcherJSON = "" Then WatcherJSON = "{}"
+
+        Dim validatedResult As (DateTime, ObservableCollection(Of WatchedFolder))
+        Try
+            validatedResult = JsonSerializer.Deserialize(Of (DateTime, ObservableCollection(Of WatchedFolder)))(WatcherJSON, New JsonSerializerOptions With {.IncludeFields = True})
+
+        Catch ex As Exception
+            validatedResult = (DateTime.Now, Nothing)
+
+        End Try
+
+        Return validatedResult
+
+    End Function
     Private Sub WriteToFile()
 
-        Dim output = JsonSerializer.Serialize((LastAnalysed, WatchedFolders), New JsonSerializerOptions With {.IncludeFields = True})
+        Dim output = JsonSerializer.Serialize((LastAnalysed, WatchedFolders), New JsonSerializerOptions With {.IncludeFields = True, .WriteIndented = True})
         IO.File.WriteAllText(WatcherJSONFile.FullName, output)
 
     End Sub

CompactGUI/Models/SetttingsHandler.vb

@@ -13,10 +13,7 @@ Public Class SettingsHandler : Inherits ObservableObject
         If Not DataFolder.Exists Then DataFolder.Create()
         If Not SettingsJSONFile.Exists Then Await SettingsJSONFile.Create().DisposeAsync()
 
-        Dim SettingsJSON = IO.File.ReadAllText(SettingsJSONFile.FullName)
-        If SettingsJSON = "" Then SettingsJSON = "{}"
-
-        AppSettings = JsonSerializer.Deserialize(Of Settings)(SettingsJSON, New JsonSerializerOptions With {.IncludeFields = True})
+        AppSettings = DeserializeAndValidateJSON(SettingsJSONFile)
 
         If AppSettings.SettingsVersion = 0 OrElse SettingsVersion > AppSettings.SettingsVersion Then
             AppSettings = New Settings
@@ -33,6 +30,28 @@ Public Class SettingsHandler : Inherits ObservableObject
 
     End Sub
 
+    Private Shared Function DeserializeAndValidateJSON(inputjsonFile As IO.FileInfo) As Settings
+        Dim SettingsJSON = IO.File.ReadAllText(inputjsonFile.FullName)
+        If SettingsJSON = "" Then SettingsJSON = "{}"
+
+        Dim validatedSettings As Settings
+
+        Try
+            validatedSettings = JsonSerializer.Deserialize(Of Settings)(SettingsJSON, New JsonSerializerOptions With {.IncludeFields = True})
+        Catch ex As Exception
+            validatedSettings = New Settings
+            validatedSettings.SettingsVersion = SettingsVersion
+
+            Dim msgError As New ModernWpf.Controls.ContentDialog With {.Title = $"Corrupted Settings File Detected", .Content = "Your settings have been reset to their default.", .CloseButtonText = "OK"}
+            msgError.ShowAsync()
+
+
+        End Try
+
+        Return validatedSettings
+
+    End Function
+
 
     Private Shared Sub InitialiseWindowSize()
 

CompactGUI/Models/UpdateHandler.vb

@@ -2,7 +2,7 @@
 Imports System.Text.Json
 Public Class UpdateHandler
 
-    Public Shared CurrentVersion As New SemVersion(3, 1, 0)
+    Public Shared CurrentVersion As New SemVersion(3, 1, 1)
     Public Shared NewVersion As SemVersion
     Shared UpdateURL As String = "https://raw.githubusercontent.com/IridiumIO/CompactGUI/database/version.json"