Added graceful exit as settings option

Author: codemunkie15

src/ReolinkRestart/ReolinkClient/ReolinkClientService.cs

@@ -30,11 +30,21 @@ public void Terminate(bool waitForExit = false)
         {
             var process = GetClientProcess();
 
-            process?.CloseMainWindow();
-
-            if (waitForExit)
+            if (process != null)
             {
-                process?.WaitForExit();
+                if (settingsService.Settings!.ReolinkClientGracefulExit)
+                {
+                    process.CloseMainWindow();
+                }
+                else
+                {
+                    process.Kill();
+                }
+
+                if (waitForExit)
+                {
+                    process.WaitForExit();
+                }
             }
         }
 

src/ReolinkRestart/Settings/Settings.cs

@@ -2,16 +2,18 @@
 {
     public class Settings
     {
-        public required string ReolinkExecutableFilePath { get; set; }
+        public string ReolinkExecutableFilePath { get; set; } = @"%localAppData%\Programs\Reolink\Reolink.exe";
 
-        public required int RestartIntervalMinutes { get; set; }
+        public int RestartIntervalMinutes { get; set; } = 60;
 
-        public required bool UseFullscreen { get; set; }
+        public bool UseFullscreen { get; set; } = true;
 
-        public required int FullscreenDelaySeconds { get; set; }
+        public int FullscreenDelaySeconds { get; set; } = 4;
 
-        public required int FullscreenXOffset { get; set; }
+        public int FullscreenXOffset { get; set; } = 50;
 
-        public required int FullscreenYOffset { get; set; }
+        public int FullscreenYOffset { get; set; } = 40;
+
+        public bool ReolinkClientGracefulExit { get; set; } = true;
     }
 }

src/ReolinkRestart/Settings/SettingsService.cs

@@ -28,16 +28,12 @@ public bool ValidateAndLoadSettings(out string? message)
 
         private void CreateSettings()
         {
-            var settings = new Settings
-            {
-                ReolinkExecutableFilePath = @"%localAppData%\Programs\Reolink\Reolink.exe",
-                RestartIntervalMinutes = 60,
-                UseFullscreen = true,
-                FullscreenDelaySeconds = 4,
-                FullscreenXOffset = 50,
-                FullscreenYOffset = 40
-            };
+            var settings = new Settings();
+            WriteSettings(settings);
+        }
 
+        private void WriteSettings(Settings settings)
+        {
             var json = JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true });
             File.WriteAllText(SettingsFileName, json);
         }
@@ -47,6 +43,9 @@ private void LoadSettings()
             var json = File.ReadAllText(SettingsFileName);
             Settings = JsonSerializer.Deserialize<Settings>(json)!;
 
+            // Write the settings back in-case there are new options
+            WriteSettings(Settings);
+
             Settings!.ReolinkExecutableFilePath = Environment.ExpandEnvironmentVariables(Settings.ReolinkExecutableFilePath);
         }