waaverecords · waaverecords · Apr 19, 2025 · Apr 19, 2025 · Apr 19, 2025 · Apr 19, 2025
diff --git a/CmdPal.Ext.Spotify/Commands/PausePlaybackCommand.cs b/CmdPal.Ext.Spotify/Commands/PausePlaybackCommand.cs
@@ -1,4 +1,6 @@
-using SpotifyAPI.Web;
+using CmdPal.Ext.Spotify.Helpers;
+using CmdPal.Ext.Spotify.Properties;
+using SpotifyAPI.Web;
 using System.Threading.Tasks;
 
 namespace CmdPal.Ext.Spotify.Commands;
@@ -7,6 +9,8 @@ internal sealed partial class PausePlaybackCommand : PlayerCommand<PlayerPausePl
 {
     public PausePlaybackCommand(SpotifyClient spotifyClient) : base(spotifyClient, new())
     {
+        Name = Resources.ResultPausePlaybackTitle;
+        Icon = Icons.Pause;
     }
 
     protected override async Task InvokeAsync(IPlayerClient player, PlayerPausePlaybackRequest requestParams)

diff --git a/CmdPal.Ext.Spotify/Commands/ResumePlaybackCommand.cs b/CmdPal.Ext.Spotify/Commands/ResumePlaybackCommand.cs
@@ -1,4 +1,6 @@
-using SpotifyAPI.Web;
+using CmdPal.Ext.Spotify.Helpers;
+using CmdPal.Ext.Spotify.Properties;
+using SpotifyAPI.Web;
 using System.Threading.Tasks;
 
 namespace CmdPal.Ext.Spotify.Commands;
@@ -7,9 +9,11 @@ internal sealed partial class ResumePlaybackCommand : PlayerCommand<PlayerResume
 {
     public ResumePlaybackCommand(SpotifyClient spotifyClient, PlayerResumePlaybackRequest requestParams = null) : base(spotifyClient, requestParams ?? new())
     {
+        Name = requestParams == null ? Resources.ResultResumePlaybackTitle : Resources.ResultPlayName;
+        Icon = Icons.Play;
     }
 
-    public ResumePlaybackCommand(SpotifyClient spotifyClient, string contextUri) : base(spotifyClient, new PlayerResumePlaybackRequest { ContextUri = contextUri })
+    public ResumePlaybackCommand(SpotifyClient spotifyClient, string contextUri) : this(spotifyClient, new PlayerResumePlaybackRequest { ContextUri = contextUri })
     {
     }
 

diff --git a/CmdPal.Ext.Spotify/Commands/SetRepeatCommand.cs b/CmdPal.Ext.Spotify/Commands/SetRepeatCommand.cs
@@ -1,4 +1,6 @@
-using SpotifyAPI.Web;
+using CmdPal.Ext.Spotify.Helpers;
+using CmdPal.Ext.Spotify.Properties;
+using SpotifyAPI.Web;
 using System.Threading.Tasks;
 
 namespace CmdPal.Ext.Spotify.Commands;
@@ -7,6 +9,13 @@ internal sealed partial class SetRepeatCommand : PlayerCommand<PlayerSetRepeatRe
 {
     public SetRepeatCommand(SpotifyClient spotifyClient, PlayerSetRepeatRequest requestParams) : base(spotifyClient, requestParams)
     {
+        Name = requestParams.StateParam switch
+        {
+            PlayerSetRepeatRequest.State.Off => Resources.ResultSetRepeatOffTitle,
+            PlayerSetRepeatRequest.State.Context => Resources.ResultSetRepeatContextTitle,
+            PlayerSetRepeatRequest.State.Track => Resources.ResultSetRepeatTrackTitle,
+        };
+        Icon = Icons.Repeat;
     }
 
     protected override async Task InvokeAsync(IPlayerClient player, PlayerSetRepeatRequest requestParams)

diff --git a/CmdPal.Ext.Spotify/Commands/SetShuffleCommand.cs b/CmdPal.Ext.Spotify/Commands/SetShuffleCommand.cs
@@ -1,4 +1,6 @@
-using SpotifyAPI.Web;
+using CmdPal.Ext.Spotify.Helpers;
+using CmdPal.Ext.Spotify.Properties;
+using SpotifyAPI.Web;
 using System.Threading.Tasks;
 
 namespace CmdPal.Ext.Spotify.Commands;
@@ -7,6 +9,12 @@ internal sealed partial class SetShuffleCommand : PlayerCommand<PlayerShuffleReq
 {
     public SetShuffleCommand(SpotifyClient spotifyClient, PlayerShuffleRequest requestParams) : base(spotifyClient, requestParams)
     {
+        Name = requestParams.State switch
+        {
+            true => Resources.ResultTurnOnShuffleTitle,
+            false => Resources.ResultTurnOffShuffleTitle,
+        };
+        Icon = Icons.Shuffle;
     }
 
     protected override async Task InvokeAsync(IPlayerClient player, PlayerShuffleRequest requestParams)

diff --git a/CmdPal.Ext.Spotify/Commands/SkipNextCommand.cs b/CmdPal.Ext.Spotify/Commands/SkipNextCommand.cs
@@ -1,4 +1,6 @@
-using SpotifyAPI.Web;
+using CmdPal.Ext.Spotify.Helpers;
+using CmdPal.Ext.Spotify.Properties;
+using SpotifyAPI.Web;
 using System.Threading.Tasks;
 
 namespace CmdPal.Ext.Spotify.Commands;
@@ -7,6 +9,8 @@ internal sealed partial class SkipNextCommand : PlayerCommand<PlayerSkipNextRequ
 {
     public SkipNextCommand(SpotifyClient spotifyClient) : base(spotifyClient, new())
     {
+        Name = Resources.ResultNextTrackTitle;
+        Icon = Icons.Next;
     }
 
     protected override async Task InvokeAsync(IPlayerClient player, PlayerSkipNextRequest requestParams)

diff --git a/CmdPal.Ext.Spotify/Commands/SkipPreviousCommand.cs b/CmdPal.Ext.Spotify/Commands/SkipPreviousCommand.cs
@@ -1,4 +1,6 @@
-using SpotifyAPI.Web;
+using CmdPal.Ext.Spotify.Helpers;
+using CmdPal.Ext.Spotify.Properties;
+using SpotifyAPI.Web;
 using System.Threading.Tasks;
 
 namespace CmdPal.Ext.Spotify.Commands;
@@ -7,6 +9,8 @@ internal sealed partial class SkipPreviousCommand : PlayerCommand<PlayerSkipPrev
 {
     public SkipPreviousCommand(SpotifyClient spotifyClient) : base(spotifyClient, new())
     {
+        Name = Resources.ResultPreviousTrackTitle;
+        Icon = Icons.Previous;
     }
 
     protected override async Task InvokeAsync(IPlayerClient player, PlayerSkipPreviousRequest requestParams)

diff --git a/CmdPal.Ext.Spotify/Commands/TogglePlaybackCommand.cs b/CmdPal.Ext.Spotify/Commands/TogglePlaybackCommand.cs
@@ -1,4 +1,6 @@
-using Microsoft.CommandPalette.Extensions.Toolkit;
+using CmdPal.Ext.Spotify.Helpers;
+using CmdPal.Ext.Spotify.Properties;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 using SpotifyAPI.Web;
 using System.Threading.Tasks;
 
@@ -8,6 +10,8 @@ internal sealed partial class TogglePlaybackCommand : PlayerCommand<PlayerResume
 {
     public TogglePlaybackCommand(SpotifyClient spotifyClient) : base(spotifyClient, new())
     {
+        Name = Resources.ResultTogglePlaybackTitle;
+        Icon = Icons.PlayPause;
     }
 
     protected override async Task InvokeAsync(IPlayerClient player, PlayerResumePlaybackRequest requestParams)

diff --git a/CmdPal.Ext.Spotify/Pages/SpotifListPage.cs b/CmdPal.Ext.Spotify/Pages/SpotifListPage.cs
@@ -24,9 +24,9 @@ internal sealed partial class SpotifyListPage : DynamicListPage
 
     public SpotifyListPage(SettingsManager settingsManager)
     {
-        Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.png");
-        Title = Resources.ExtensionDisplayName;
-        Name = Resources.ExtensionDisplayName;
+        Icon = Icons.Spotify;
+        Title = Resources.PageTitle;
+        Name = Resources.PageTitle;
 
         _settingsManager = settingsManager;
         _settingsManager.Settings.SettingsChanged += (_, _) => SearchAsync(SearchText);
@@ -35,8 +35,18 @@ public SpotifyListPage(SettingsManager settingsManager)
         _credentialsPath = Path.Combine(appDataPath, "credentials.json");
 
         _items = [.. GetItems(string.Empty).GetAwaiter().GetResult()];
+
+        EmptyContent = _defaultEmptyContent;
     }
 
+    private CommandItem _defaultEmptyContent => new(GetPlaybackCommands()[0])
+    {
+        Title = Resources.EmptyContentTitle,
+        Subtitle = Resources.EmptyContentSubtitle,
+        Icon = Icons.Spotify,
+        MoreCommands = GetPlaybackCommands().Skip(1).Select(command => new CommandContextItem(command)).ToArray(),
+    };
+
     public override IListItem[] GetItems() => [.. _items];
 
     public override void UpdateSearchText(string oldSearch, string newSearch)
@@ -64,36 +74,56 @@ private async Task<List<ListItem>> GetItems(string search)
         var clientId = _settingsManager.ClientId;
 
         if (string.IsNullOrEmpty(clientId))
-            return [
-                new ListItem(new NoOpCommand())
-                {
-                    Title = Resources.ResultMissingClientIdTitle,
-                    Subtitle = Resources.ResultMissingClientIdSubTitle
-                }
-            ];
-
+        {
+            EmptyContent = new CommandItem()
+            {
+                Title = Resources.ResultMissingClientIdTitle,
+                Subtitle = Resources.ResultMissingClientIdSubTitle,
+            };
+            return [];
+        }
 
         if (!File.Exists(_credentialsPath))
         {
             var loginCommand = new LoginCommand(clientId, _credentialsPath);
             loginCommand.LoggedIn += (_, _) => SearchAsync(search);
-
-            return [
-                new ListItem(loginCommand)
-                {
-                    Title = Resources.ResultLoginTitle,
-                    Subtitle = Resources.ResultLoginSubTitle
-                }
-            ];
+            EmptyContent = new CommandItem(loginCommand)
+            {
+                Title = Resources.ResultLoginTitle,
+                Subtitle = Resources.ResultLoginSubTitle,
+                Icon = Icons.Spotify,
+            };
+            return [];
         }
 
         if (_spotifyClient == null)
             _spotifyClient = await GetSpotifyClientAsync(clientId);
 
         if (string.IsNullOrEmpty(search.Trim()))
-            return GetPlayertItems();
+        {
+            EmptyContent = _defaultEmptyContent;
+            return [];
+        }
 
-        return await GetSearchItemsAsync(search);
+        try
+        {
+            var results = await GetSearchItemsAsync(search);
+            if (results.Count == 0)
+            {
+                EmptyContent = new CommandItem()
+                {
+                    Title = Resources.EmptyResultsTitle,
+                };
+            }
+            return results;
+        }
+        catch (Exception ex)
+        {
+            EmptyContent = new CommandItem() { 
+                Title = Resources.EmptyErrorTitle,
+            };
+        }
+        return [];
     }
 
     private async Task<SpotifyClient> GetSpotifyClientAsync(string clientId)
@@ -111,58 +141,23 @@ private async Task<SpotifyClient> GetSpotifyClientAsync(string clientId)
     }
 
     private List<ListItem> GetPlayertItems()
+    {
+        return GetPlaybackCommands().Select(command => new ListItem(command)).ToList();
+    }
+
+    public List<Command> GetPlaybackCommands()
     {
         return [
-            new ListItem(new TogglePlaybackCommand(_spotifyClient))
-            {
-                Title = Resources.ResultTogglePlaybackTitle,
-                Icon = Icons.PlayPause,
-            },
-            new ListItem(new PausePlaybackCommand(_spotifyClient))
-            {
-                Title = Resources.ResultPausePlaybackTitle,
-                Icon = Icons.Pause,
-            },
-            new ListItem(new ResumePlaybackCommand(_spotifyClient))
-            {
-                Title = Resources.ResultResumePlaybackTitle,
-                Icon = Icons.Play,
-            },
-            new ListItem(new SkipNextCommand(_spotifyClient))
-            {
-                Title = Resources.ResultNextTrackTitle,
-                Icon = Icons.Next,
-            },
-            new ListItem(new SkipPreviousCommand(_spotifyClient))
-            {
-                Title = Resources.ResultPreviousTrackTitle,
-                Icon = Icons.Previous,
-            },
-            new ListItem(new SetShuffleCommand(_spotifyClient, new(true)))
-            {
-                Title = Resources.ResultTurnOnShuffleTitle,
-                Icon = Icons.Shuffle,
-            },
-            new ListItem(new SetShuffleCommand(_spotifyClient, new(false)))
-            {
-                Title = Resources.ResultTurnOffShuffleTitle,
-                Icon = Icons.Shuffle,
-            },
-            new ListItem(new SetRepeatCommand(_spotifyClient, new(PlayerSetRepeatRequest.State.Track)))
-            {
-                Title = Resources.ResultSetRepeatTrackTitle,
-                Icon = Icons.Repeat,
-            },
-            new ListItem(new SetRepeatCommand(_spotifyClient, new(PlayerSetRepeatRequest.State.Context)))
-            {
-                Title = Resources.ResultSetRepeatContextTitle,
-                Icon = Icons.Repeat,
-            },
-            new ListItem(new SetRepeatCommand(_spotifyClient, new(PlayerSetRepeatRequest.State.Off)))
-            {
-                Title = Resources.ResultSetRepeatOffTitle,
-                Icon = Icons.Repeat,
-            },
+            new TogglePlaybackCommand(_spotifyClient),
+            new PausePlaybackCommand(_spotifyClient),
+            new ResumePlaybackCommand(_spotifyClient),
+            new SkipNextCommand(_spotifyClient),
+            new SkipPreviousCommand(_spotifyClient),
+            new SetShuffleCommand(_spotifyClient, new(true)),
+            new SetShuffleCommand(_spotifyClient, new(false)),
+            new SetRepeatCommand(_spotifyClient, new(PlayerSetRepeatRequest.State.Track)),
+            new SetRepeatCommand(_spotifyClient, new(PlayerSetRepeatRequest.State.Context)),
+            new SetRepeatCommand(_spotifyClient, new(PlayerSetRepeatRequest.State.Off)),
         ];
     }
 
@@ -182,7 +177,7 @@ private async Task<List<ListItem>> GetSearchItemsAsync(string search)
                 new ListItem(new ResumePlaybackCommand(_spotifyClient, new PlayerResumePlaybackRequest() { Uris = [track.Uri] }))
                 {
                     Title = track.Name,
-                    Subtitle = $"{Resources.ResultSongSubTitle}{(track.Explicit ? $" � {Resources.ResultSongExplicitSubTitle}" : "")} � {Resources.ResultSongBySubTitle} {string.Join(", ", track.Artists.Select(x => x.Name))}",
+                    Subtitle = $"{Resources.ResultSongSubTitle}{(track.Explicit ? $" � {Resources.ResultSongExplicitSubTitle}" : "")} � {Resources.ResultSongBySubTitle} {string.Join(", ", track.Artists.Select(x => x.Name))}",
                     Icon = new IconInfo(track.Album.Images.OrderBy(x => x.Width * x.Height).FirstOrDefault()?.Url),
                 })
             );

diff --git a/CmdPal.Ext.Spotify/Properties/Resources.Designer.cs b/CmdPal.Ext.Spotify/Properties/Resources.Designer.cs