Fix recognition api state issues

Soapwood · Apr 4, 2024 · 89f5eed · 89f5eed
1 parent 063752e
commit 89f5eed
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 34 deletions.
diff --git a/VXMusic/Recognition/AudD/AudDClient.cs b/VXMusic/Recognition/AudD/AudDClient.cs
@@ -60,6 +60,9 @@ public void SetDefaultApiKey()
 
     public async Task<bool> TestApiConnection()
     {
-        return await _audDHttpClient.TestConnection();
+        _logger.LogTrace("Testing AudD API Connection");
+        bool testConnectionResult = await _audDHttpClient.TestConnection();
+        _logger.LogTrace(testConnectionResult ? "Connected!" : "Connection Failed.");
+        return testConnectionResult;
     }
 }
diff --git a/VXMusic/Recognition/Shazam/ShazamClient.cs b/VXMusic/Recognition/Shazam/ShazamClient.cs
@@ -52,7 +52,10 @@ public void SetDefaultApiKey()
 
     public async Task<bool> TestApiConnection()
     {
-        return await _shazamHttpClient.TestConnection();
+        _logger.LogTrace("Testing Shazam API Connection");
+        bool testConnectionResult = await _shazamHttpClient.TestConnection();
+        _logger.LogTrace(testConnectionResult ? "Connected!" : "Connection Failed.");
+        return testConnectionResult;
     }
 
     public async Task<IRecognitionApiClientResponse> RunRecognition()

diff --git a/VXMusicDesktop/MVVM/View/RecognitionView.xaml b/VXMusicDesktop/MVVM/View/RecognitionView.xaml
@@ -137,8 +137,9 @@
 
             <!-- BYOAPI -->
             <CheckBox x:Name="ShazamByoApiCheckBox"
-                      Content="BYOAPI Key"
+                      Content="Enable BYOAPI"
                       IsChecked="{Binding IsShazamByoApiEnabled}"
+                      IsEnabled="{Binding IsShazamApiEnabled}"
                       VerticalAlignment="Center" HorizontalAlignment="Center"
                       Style="{StaticResource CustomCheckBoxStyle}"
                       Checked="ShazamByoApiCheckButtonChecked" Unchecked="ShazamByoApiCheckButtonUnchecked"/>
@@ -276,8 +277,9 @@
 
             <!-- BYOAPI -->
             <CheckBox x:Name="AudDByoApiCheckBox"
-                      Content="BYOAPI Key"
+                      Content="Enable BYOAPI"
                       IsChecked="{Binding IsAudDByoApiEnabled, Mode=TwoWay}"
+                      IsEnabled="{Binding IsAudDApiEnabled, Mode=TwoWay}"
                       VerticalAlignment="Center" HorizontalAlignment="Center"
                       Style="{StaticResource CustomCheckBoxStyle}"
                       Checked="AudDByoApiCheckButtonChecked" Unchecked="AudDByoApiCheckButtonUnchecked"/>

diff --git a/VXMusicDesktop/MVVM/View/RecognitionView.xaml.cs b/VXMusicDesktop/MVVM/View/RecognitionView.xaml.cs
@@ -78,6 +78,8 @@ private void ShazamByoApiCheckButtonChecked(object sender, RoutedEventArgs e)
                 recognitionViewModel.SharedViewModel.IsShazamApiConnected = false;
                 recognitionViewModel.IsShazamByoApiEnabled = true;
 
+                ShazamByoApiCheckBox.Content = "Disable BYOAPI";
+
                 recognitionViewModel.PerformSaveAndTestShazamByoApi();
                 //LastFmPasswordBoxHintText.Visibility = String.IsNullOrEmpty(connectionsViewModel.LastFmPassword) ? Visibility.Visible : Visibility.Hidden;
             }
@@ -89,8 +91,11 @@ private void ShazamByoApiCheckButtonUnchecked(object sender, RoutedEventArgs e)
             {
                 recognitionViewModel.SharedViewModel.IsShazamApiConnected = false;
                 recognitionViewModel.IsShazamByoApiEnabled = false;
-
-                recognitionViewModel.SetShazamApiKeyToDefaultAndTest();
+
+                ShazamByoApiCheckBox.Content = "Enable BYOAPI";
+
+                if(recognitionViewModel.IsShazamApiEnabled)
+                    recognitionViewModel.SetShazamApiKeyToDefaultAndTest();
             }
         }
 
@@ -150,12 +155,14 @@ private void AudDByoApiCheckButtonChecked(object sender, RoutedEventArgs e)
             if (this.DataContext is RecognitionViewModel recognitionViewModel)
             {
                 // Disable button if the other API is enabled
-                if (recognitionViewModel.IsShazamApiEnabled)
-                    return;
+                //if (recognitionViewModel.IsShazamApiEnabled)
+                //    return;
 
                 recognitionViewModel.SharedViewModel.IsAudDApiConnected = false;
                 recognitionViewModel.IsAudDByoApiEnabled = true;
 
+                AudDByoApiCheckBox.Content = "Disable BYOAPI";
+
                 recognitionViewModel.PerformSaveAndTestAudDByoApi();
             }
         }
@@ -166,8 +173,11 @@ private void AudDByoApiCheckButtonUnchecked(object sender, RoutedEventArgs e)
             {
                 recognitionViewModel.SharedViewModel.IsAudDApiConnected = false;
                 recognitionViewModel.IsAudDByoApiEnabled = false;
+
+                AudDByoApiCheckBox.Content = "Enable BYOAPI";
 
-                recognitionViewModel.SetAudDApiKeyToDefaultAndTest();
+                if(recognitionViewModel.IsAudDApiEnabled)
+                    recognitionViewModel.SetAudDApiKeyToDefaultAndTest();
             }
         }
 

diff --git a/VXMusicDesktop/MVVM/ViewModel/RecognitionViewModel.cs b/VXMusicDesktop/MVVM/ViewModel/RecognitionViewModel.cs
@@ -146,16 +146,6 @@ public bool IsShazamByoApiEnabled
                 OnPropertyChanged(nameof(IsShazamByoApiEnabled));
             }
         }
-
-        // public bool IsShazamApiConnected
-        // {
-        //     get { return _isShazamApiConnected; }
-        //     set
-        //     {
-        //         _isShazamApiConnected = value;
-        //         OnPropertyChanged(nameof(IsShazamApiConnected));
-        //     }
-        // }
 
         public bool IsAudDApiEnabled
         {
@@ -176,16 +166,6 @@ public bool IsAudDByoApiEnabled
                 OnPropertyChanged(nameof(IsAudDByoApiEnabled));
             }
         }
-
-        // public bool IsAudDApiConnected
-        // {
-        //     get { return _isAudDApiConnected; }
-        //     set
-        //     {
-        //         _isAudDApiConnected = value;
-        //         OnPropertyChanged(nameof(IsAudDApiConnected));
-        //     }
-        // }
 
         public bool IsRecognitionReady
         {
@@ -207,17 +187,17 @@ private void ProcessRecognitionApiState()
                                             !String.IsNullOrEmpty(App.VXMusicSession.RecognitionSettings.ShazamSettings.ByoApiKey);
 
                     IsAudDApiEnabled = false;
-                    IsAudDByoApiEnabled = App.VXMusicSession.RecognitionSettings.AudDSettings.IsByoApiEnabled && 
-                                          !String.IsNullOrEmpty(App.VXMusicSession.RecognitionSettings.AudDSettings.ByoApiKey);
+                    IsAudDByoApiEnabled = false; //App.VXMusicSession.RecognitionSettings.AudDSettings.IsByoApiEnabled && 
+                                          //!String.IsNullOrEmpty(App.VXMusicSession.RecognitionSettings.AudDSettings.ByoApiKey);
                     break;
                 case RecognitionApi.AudD:
                     IsAudDApiEnabled = true;
                     IsAudDByoApiEnabled = App.VXMusicSession.RecognitionSettings.AudDSettings.IsByoApiEnabled && 
                                           !String.IsNullOrEmpty(App.VXMusicSession.RecognitionSettings.AudDSettings.ByoApiKey);
 
                     IsShazamApiEnabled = false;
-                    IsShazamByoApiEnabled = App.VXMusicSession.RecognitionSettings.ShazamSettings.IsByoApiEnabled && 
-                                            !String.IsNullOrEmpty(App.VXMusicSession.RecognitionSettings.ShazamSettings.ByoApiKey);
+                    IsShazamByoApiEnabled = false; //App.VXMusicSession.RecognitionSettings.ShazamSettings.IsByoApiEnabled && 
+                                            //!String.IsNullOrEmpty(App.VXMusicSession.RecognitionSettings.ShazamSettings.ByoApiKey);
                     break;
                 default:
                     IsShazamApiEnabled = false;
@@ -311,13 +291,23 @@ private void PerformShazamButtonClick(object commandParameter)
         {
             App.VXMusicSession.SetRecognitionClient(RecognitionApi.Shazam);
             VXUserSettings.Recognition.SetRecognitionApi(RecognitionApi.Shazam);
+
+            SharedViewModel.IsAudDApiConnected = false;
+            IsAudDApiEnabled = false;
+            IsAudDByoApiEnabled = false;
+
             ProcessRecognitionApiState();
         }
 
         private void PerformAudDButtonClick(object commandParameter)
         {
             App.VXMusicSession.SetRecognitionClient(RecognitionApi.AudD);
             VXUserSettings.Recognition.SetRecognitionApi(RecognitionApi.AudD);
+
+            SharedViewModel.IsShazamApiConnected = false;
+            IsShazamApiEnabled = false;
+            IsShazamByoApiEnabled = false;
+
             ProcessRecognitionApiState();
         }
 

diff --git a/VXMusicDesktop/VXUserSettings.cs b/VXMusicDesktop/VXUserSettings.cs
@@ -66,7 +66,8 @@ public static void SetShazamByoApiKey(string byoApiKey)
             Properties.Settings.Default.ShazamByoApiKey = byoApiKey;
             Properties.Settings.Default.Save();
 
-            Logger.LogDebug($"User Setting ShazamByoApiKey set to {Properties.Settings.Default.ShazamByoApiKey}");
+            Logger.LogDebug($"User Setting ShazamByoApiKey set to **************************");
+            //Logger.LogDebug($"User Setting ShazamByoApiKey set to {Properties.Settings.Default.ShazamByoApiKey}");
         }
 
         public static string GetShazamByoApiKey()