Merge pull request #3 from Soapwood/design/HoverHighlighting

[Bug] Fix Overlay not having the scope to test ShazamAPI anymore.

Author: Soapwood

VXMusic/Notifications/SteamVR/SteamVRNotificationClient.cs

@@ -18,7 +18,7 @@ public class SteamVRNotificationClient : Application, INotificationClient
 
         private readonly SteamVRNotificationOverlay _steamVrNotificationClient;
 
-        private static string DefaultVxLogo;
+        public static string DefaultVxLogo;
 
         public SteamVRNotificationClient(IServiceProvider serviceProvider)
             : base(ApplicationType.Overlay)
@@ -72,7 +72,17 @@ public void SendNotificationInternal(string title, string content, int timeout,
         {
             _logger.LogTrace("Sending notification request to SteamVR.");
 
-            var imageBytes = Convert.FromBase64String(image);
+            byte[] imageBytes;
+            
+            try
+            {
+                imageBytes = Convert.FromBase64String(image);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInformation("Image returned from Shazam could not be parsed by the SteamVRNotificationClient. Falling back to the Default.");
+                imageBytes = Convert.FromBase64String(SteamVRNotificationClient.DefaultVxLogo);
+            }
 
             Bitmap bitmap = new Bitmap(new MemoryStream(imageBytes));
 

VXMusicDesktop/MVVM/ViewModel/HomeViewModel.cs

@@ -21,6 +21,8 @@ public HomeViewModel(SharedViewModel sharedViewModel)
             SharedViewModel = sharedViewModel;
             GetVxTipsText();
             FetchVxNewsText();
+
+            SharedViewModel.IsShazamApiConnected = true;
         }
 
         protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)

VXMusicDesktop/MVVM/ViewModel/MainViewModel.cs

@@ -59,6 +59,7 @@ public MainViewModel()
             CurrentView = HomeVM;
 
             VXMusicOverlayInterface.SharedViewModel = SharedVM;
+            VXMusicSession.SharedViewModel = SharedVM;
 
             HomeViewCommand = new RelayCommand(o =>
             {

VXMusicDesktop/Overlay/VXMusicOverlayInterface.cs

@@ -425,8 +425,6 @@ private static bool IsCurrentRecognitionClientConnected(RecognitionApi currentRe
         {
             case RecognitionApi.Shazam:
                 return SharedViewModel.IsShazamApiConnected;
-            case RecognitionApi.AudD:
-                return SharedViewModel.IsAudDApiConnected;
             case RecognitionApi.Unknown:
                 return false;
             default:
@@ -438,17 +436,18 @@ public static async Task<bool> HandleRecognitionRequest()
     {
         RecognitionApi currentRecognitionApi = App.VXMusicSession.RecognitionSettings.CurrentRecognitionApi;
 
-        if (!IsCurrentRecognitionClientConnected(currentRecognitionApi))
-        {
-            Logger.LogError($"Recognition Failed. {currentRecognitionApi} is not connected.");
-            SharedViewModel.IsRecognitionRunning = false;
-            //App.ToastNotification.Error($"{currentRecognitionApi} is not connected! Check your Recognition settings.");
-            VXMusicSession.NotificationClient.SendNotification(NotificationLevel.Error, "Recognition Failed", $"{currentRecognitionApi} is not connected! Check your Recognition settings.", 8);
-            App.VXMusicSession.ToastNotification.SendNotification(NotificationLevel.Error, "Recognition Failed", $"{currentRecognitionApi} is not connected! Check your Recognition settings.", 8);
-            // Finish, or effectively cancel recognition if fails.
-            SendMessageToVxMusicOverlayOverTcp(VXMMessage.RECOGNITION_FINISH);
-            return false;
-        }
+        // This shouldn't be checked by the overlay anyway
+        // if (!IsCurrentRecognitionClientConnected(currentRecognitionApi))
+        // {
+        //     Logger.LogError($"Recognition Failed. {currentRecognitionApi} is not connected.");
+        //     SharedViewModel.IsRecognitionRunning = false;
+        //     //App.ToastNotification.Error($"{currentRecognitionApi} is not connected! Check your Recognition settings.");
+        //     VXMusicSession.NotificationClient.SendNotification(NotificationLevel.Error, "Recognition Failed", $"{currentRecognitionApi} is not connected! Check your Recognition settings.", 8);
+        //     App.VXMusicSession.ToastNotification.SendNotification(NotificationLevel.Error, "Recognition Failed", $"{currentRecognitionApi} is not connected! Check your Recognition settings.", 8);
+        //     // Finish, or effectively cancel recognition if fails.
+        //     SendMessageToVxMusicOverlayOverTcp(VXMMessage.RECOGNITION_FINISH);
+        //     return false;
+        // }
 
         if (!SharedViewModel.IsRecognitionRunning)
         {

VXMusicDesktop/VXMusicSession.cs

@@ -16,6 +16,7 @@
 using VXMusic.Tidal.Authentication;
 using VXMusic.VRChat;
 using VXMusicDesktop.Core;
+using VXMusicDesktop.MVVM.ViewModel;
 using VXMusicDesktop.Theme;
 using VXMusicDesktop.Toast;
 using VXMusicDesktop.Update;
@@ -52,6 +53,8 @@ public class VXMusicSession
     public VXMusicSettingsSyncHandler VXMusicSettingsSync;
     public RegistryInterface RegistryInterface;
 
+    public static SharedViewModel SharedViewModel { get; set; }
+    
     public static event EventHandler LastFmLogin;
     //public static event EventHandler SpotifyLogin;
 
@@ -75,8 +78,7 @@ public void Initialise()
         //NotificationClient = new XSOverlay(); //VXMusicAPI.SetNotificationClient(notificationSettings.CurrentNotificationService);
 
         NotificationClient = NotificationSettings.GetNotificationServiceFromSetConfiguration(); //VXMusicAPI.SetNotificationClient(notificationSettings.CurrentNotificationService);
-
-
+        
         VrChatNotification = NotificationSettings.GetVRChatNotificationClient();
 
         PlaylistFileWriter = App.ServiceProvider.GetRequiredService<PlaylistFileWriter>();