NowPlaying API fire only during running

rocksdanister · Feb 20, 2023 · ede4655 · ede4655
1 parent e762e4f
commit ede4655
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/Lively.PlayerCefSharp/Form1.cs b/src/Lively.PlayerCefSharp/Form1.cs
@@ -158,14 +158,27 @@ await Task.Run(async () =>
                                     case MessageType.cmd_suspend:
                                         if (chromeBrowser.CanExecuteJavascriptInMainFrame && startArgs.PauseEvent && !isPaused) //if js context ready
                                         {
-                                            chromeBrowser.ExecuteScriptAsync("livelyWallpaperPlaybackChanged", JsonConvert.SerializeObject(new WallpaperPlaybackState() { IsPaused = true }), Formatting.Indented);
+                                            chromeBrowser.ExecuteScriptAsync("livelyWallpaperPlaybackChanged",
+                                                JsonConvert.SerializeObject(new WallpaperPlaybackState() { IsPaused = true }),
+                                                Formatting.Indented);
                                         }
                                         isPaused = true;
                                         break;
                                     case MessageType.cmd_resume:
-                                        if (chromeBrowser.CanExecuteJavascriptInMainFrame && startArgs.PauseEvent && isPaused) //if js context ready
+                                        if (chromeBrowser.CanExecuteJavascriptInMainFrame && isPaused)
                                         {
-                                            chromeBrowser.ExecuteScriptAsync("livelyWallpaperPlaybackChanged", JsonConvert.SerializeObject(new WallpaperPlaybackState() { IsPaused = false }), Formatting.Indented);
+                                            if (startArgs.PauseEvent)
+                                            {
+                                                chromeBrowser.ExecuteScriptAsync("livelyWallpaperPlaybackChanged",
+                                                    JsonConvert.SerializeObject(new WallpaperPlaybackState() { IsPaused = false }),
+                                                    Formatting.Indented);
+                                            }
+
+                                            if (startArgs.NowPlaying)
+                                            {
+                                                //update media state
+                                                chromeBrowser.ExecuteScriptAsync("livelyCurrentTrack", JsonConvert.SerializeObject(nowPlayingService?.CurrentTrack, Formatting.Indented));
+                                            }
                                         }
                                         isPaused = false;
                                         break;
@@ -486,9 +499,12 @@ private void ChromeBrowser_LoadingStateChanged(object sender, LoadingStateChange
                     nowPlayingService.NowPlayingTrackChanged += (s, e) => {
                         try
                         {
+                            if (isPaused)
+                                return;
+
                             if (chromeBrowser.CanExecuteJavascriptInMainFrame) //if js context ready
                             {
-                                ExecuteScriptFunctionAsync("livelyCurrentTrack", JsonConvert.SerializeObject(e, Formatting.Indented));
+                                chromeBrowser.ExecuteScriptAsync("livelyCurrentTrack", JsonConvert.SerializeObject(e, Formatting.Indented));
                             }
                         }
                         catch (Exception ex)
@@ -651,6 +667,11 @@ private async Task CaptureScreenshot(string filePath, ScreenshotFormat format)
             }
         }
 
+        /// <summary>
+        /// Supports arrays
+        /// </summary>
+        /// <param name="functionName"></param>
+        /// <param name="parameters"></param>
         private void ExecuteScriptFunctionAsync(string functionName, params object[] parameters)
         {
             var script = new StringBuilder();

diff --git a/src/Lively.PlayerCefSharp/Services/INowPlayingService.cs b/src/Lively.PlayerCefSharp/Services/INowPlayingService.cs
@@ -9,6 +9,7 @@ namespace Lively.PlayerCefSharp.Services
     public interface INowPlayingService
     {
         event EventHandler<NowPlayingEventArgs> NowPlayingTrackChanged;
+        NowPlayingEventArgs CurrentTrack { get; }
         void Start();
         void Stop();
     }

diff --git a/src/Lively.PlayerCefSharp/Services/NpsmNowPlayingService.cs b/src/Lively.PlayerCefSharp/Services/NpsmNowPlayingService.cs
@@ -25,6 +25,8 @@ public class NpsmNowPlayingService : INowPlayingService
 
         public NpsmNowPlayingService() { }
 
+        public NowPlayingEventArgs CurrentTrack => model;
+
         public void Start()
         {
             manager.SessionListChanged += SessionListChanged;