Handle getting config values exceptions

avdynut · Nov 3, 2019 · e65ebb3 · e65ebb3
1 parent e0b48ee
commit e65ebb3
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 30 deletions.
diff --git a/AimpLyrics/AimpLyricsPlugin.cs b/AimpLyrics/AimpLyricsPlugin.cs
@@ -13,7 +13,7 @@ public class AimpLyricsPlugin : IAIMPPlugin
     {
         public const string Name = "AimpLyrics";
         public const string Author = "Andrey Arekhva";
-        public const string Version = "1.1.1";
+        public const string Version = "1.1.2";
         public const string Description = "Display lyrics for current playing song. Find lyrics in file, tag or Google";
 
         private LyricsWindow _lyricsWindow;
@@ -35,27 +35,37 @@ public string InfoGet(AIMPPluginInfo info) =>
 
         public void Initialize(IAIMPCore core)
         {
-            Core = core;
+            try
+            {
+                Trace.WriteLine("Start Init");
 
-            AddMenuItem();
-            RegisterHook();
+                Core = core;
 
-            _lyricsWindow = new LyricsWindow();
-            _hook.FileInfoReceived += _lyricsWindow.UpdateSongInfo;
+                SetUpLogger();
 
-            _settings = new AimpLyricsPluginSettings();
+                AddMenuItem();
+                RegisterHook();
 
-            if (_settings.OpenWindowOnInitializing)
-                _hook.PlayerLoaded += OnPlayerLoaded;
+                _lyricsWindow = new LyricsWindow();
+                _hook.FileInfoReceived += _lyricsWindow.UpdateSongInfo;
 
-            if (_settings.RestoreWindowHeight)
-                _lyricsWindow.Height = _settings.WindowHeight;
+                _settings = new AimpLyricsPluginSettings();
 
-            RegisterOptions();
+                if (_settings.OpenWindowOnInitializing)
+                    _hook.PlayerLoaded += OnPlayerLoaded;
 
-            SetUpLogger();
+                if (_settings.RestoreWindowHeight)
+                    _lyricsWindow.Height = _settings.WindowHeight;
 
-            Trace.WriteLine($"Initialized AIMP Lyrics Plugin v{Version}-beta");
+                RegisterOptions();
+
+                Trace.WriteLine($"Initialized AIMP Lyrics Plugin v{Version}-beta");
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine($"Init error: {ex}");
+                throw;
+            }
         }
 
         private void AddMenuItem()
@@ -188,7 +198,7 @@ public void SystemNotification(AIMPSystemNotification notification, object data)
         public void FinalizePlugin()
         {
             if (_settings?.RestoreWindowHeight == true && _lyricsWindow != null)
-                _settings.WindowHeight = (int)_lyricsWindow.ActualHeight;
+                _settings.WindowHeight = _lyricsWindow.ActualHeight;
 
             if (_hook != null)
             {

diff --git a/AimpLyrics/Api/IAIMPServiceConfig.cs b/AimpLyrics/Api/IAIMPServiceConfig.cs
@@ -9,7 +9,9 @@ public interface IAIMPServiceConfig
     {
         // Delete
         void Delete(IAIMPString keyPath);
+
         // Read
+        // returns E_FAIL when value is not found
         double GetValueAsFloat(IAIMPString keyPath);
         int GetValueAsInt32(IAIMPString keyPath);
         long GetValueAsInt64(IAIMPString keyPath);

diff --git a/AimpLyrics/Settings/AimpLyricsPluginSettings.cs b/AimpLyrics/Settings/AimpLyricsPluginSettings.cs
@@ -1,8 +1,8 @@
 using Aimp4.Api;
 using System;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-#nullable enable
 namespace AimpLyrics.Settings
 {
     public class AimpLyricsPluginSettings : ILyricsPluginSettings
@@ -43,20 +43,20 @@ public bool RestoreWindowHeight
             set => SetString(Convert.ToString(value));
         }
 
-        private readonly int _defaultWindowHeight = 600;
-        public int WindowHeight
+        private readonly double _defaultWindowHeight = 600;
+        public double WindowHeight
         {
             get
             {
-                int height = GetInt32();
+                double height = GetDouble();
 
                 if (height < 50 || height > 3000)
                 {
                     WindowHeight = height = _defaultWindowHeight;
                 }
                 return height;
             }
-            set => SetInt32(value);
+            set => SetDouble(value);
         }
 
         private IAIMPServiceConfig Config => AimpLyricsPlugin.Core.GetService<IAIMPServiceConfig>();
@@ -69,21 +69,45 @@ private IAIMPString GetKeyPath(string key)
 
         private string GetString([CallerMemberName] string key = "")
         {
+            string value = null;
             var aimpKeyPath = GetKeyPath(key);
-            var aimpValue = Config.GetValueAsString(aimpKeyPath);
-            string value = aimpValue.GetData();
 
-            aimpKeyPath?.ReleaseComObject();
-            aimpValue?.ReleaseComObject();
+            try
+            {
+                var aimpValue = Config.GetValueAsString(aimpKeyPath);
+                value = aimpValue.GetData();
+                aimpValue?.ReleaseComObject();
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine($"GetString: {ex}");
+            }
+            finally
+            {
+                aimpKeyPath?.ReleaseComObject();
+            }
 
             return value;
         }
 
-        private int GetInt32([CallerMemberName] string key = "")
+        private double GetDouble([CallerMemberName] string key = "")
         {
+            double value = 0;
             var aimpKeyPath = GetKeyPath(key);
-            int value = Config.GetValueAsInt32(aimpKeyPath);
-            aimpKeyPath?.ReleaseComObject();
+
+            try
+            {
+                value = Config.GetValueAsFloat(aimpKeyPath);
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine($"GetDouble: {ex}");
+            }
+            finally
+            {
+                aimpKeyPath?.ReleaseComObject();
+            }
+
             return value;
         }
 
@@ -98,10 +122,10 @@ private void SetString(string value, [CallerMemberName] string key = "")
             aimpValue?.ReleaseComObject();
         }
 
-        private void SetInt32(int value, [CallerMemberName] string key = "")
+        private void SetDouble(double value, [CallerMemberName] string key = "")
         {
             var aimpKeyPath = GetKeyPath(key);
-            Config.SetValueAsInt32(aimpKeyPath, value);
+            Config.SetValueAsFloat(aimpKeyPath, value);
             aimpKeyPath?.ReleaseComObject();
         }
     }

diff --git a/AimpLyrics/Settings/ILyricsPluginSettings.cs b/AimpLyrics/Settings/ILyricsPluginSettings.cs
@@ -4,6 +4,6 @@ public interface ILyricsPluginSettings
     {
         bool OpenWindowOnInitializing { get; set; }
         bool RestoreWindowHeight { get; set; }
-        int WindowHeight { get; set; }
+        double WindowHeight { get; set; }
     }
 }