update rest

grapher is still broken

refactored io / error handling a bit

1 files changed, 10 insertions, 28 deletions

diff --git a/writer/Program.cs b/writer/Program.cs
index 37e384c..d381c16 100644
--- a/writer/Program.cs
+++ b/writer/Program.cs
@@ -16,27 +16,13 @@ namespace writer
             MessageBox.Show(msg, "Raw Accel writer");
         }
 
-        static void Send(JToken settingsToken)
-        {
-            var settings = settingsToken.ToObject<DriverSettings>();
-
-            var errors = DriverInterop.GetSettingsErrors(settings);
-            if (errors.Empty())
-            {
-                DriverInterop.Write(settings);
-                return;
-            }
-
-            Show($"Bad settings:\n\n{errors}");
-        }
-
         static void Main(string[] args)
         {
             try
             {
-                VersionHelper.ValidateAndGetDriverVersion(typeof(Program).Assembly.GetName().Version);
+                VersionHelper.ValidOrThrow();
             }
-            catch (VersionException e)
+            catch (InteropException e)
             {
                 Show(e.Message);
                 return;
@@ -48,23 +34,19 @@ namespace writer
                 return;
             }
 
-            if (!File.Exists(args[0]))
-            {
-                Show($"Settings file not found at {args[0]}");
-                return;
-            }
-
             try
             {
-                var JO = JObject.Parse(File.ReadAllText(args[0]));
+                var settings = DriverSettings.FromFile(args[0]);
+                var errors = new SettingsErrors(settings);
 
-                if (JO.ContainsKey(DriverSettings.Key))
+                if (errors.Empty())
                 {
-                    Send(JO[DriverSettings.Key]);
-                    return;
+                    new ManagedAccel(settings).Activate();
+                }
+                else
+                {
+                    Show($"Bad settings:\n\n{errors}");
                 }
-
-                Send(JO);
             }
             catch (JsonException e)
             {