Merge pull request #20 from zadjii-msft/dev/crutkas/cleanpu

media player plugin

src/modules/cmdpal/extensions/MediaControlsExtension/MediaActionsProvider.cs

@@ -3,146 +3,26 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Threading.Tasks;
 using Microsoft.Windows.CommandPalette.Extensions;
-using Microsoft.Windows.CommandPalette.Extensions.Helpers;
-using Windows.Media.Control;
 
 namespace MediaControlsExtension;
 
-internal sealed class PrevNextTrackAction : InvokableCommand
-{
-    private readonly GlobalSystemMediaTransportControlsSession mediaSession;
-    private readonly bool previous;
-    public PrevNextTrackAction(bool previous, GlobalSystemMediaTransportControlsSession s)
-    {
-        this.mediaSession = s;
-        this.previous = previous;
-        if (previous)
-        {
-            this.Name = "Previous track";
-            this.Icon = new("\ue892");
-        }
-        else
-        {
-            this.Name = "Next track";
-            this.Icon = new("\ue893");
-
-        }
-    }
-    public override ICommandResult Invoke()
-    {
-        if (this.previous)
-        {
-            _ = this.mediaSession.TrySkipPreviousAsync();
-        }
-        else
-        {
-            _ = this.mediaSession.TrySkipNextAsync();
-        }
-        return ActionResult.KeepOpen();
-    }
-}
-
-internal sealed class TogglePlayMediaAction : InvokableCommand
-{
-    internal GlobalSystemMediaTransportControlsSession mediaSession;
-    public TogglePlayMediaAction()
-    {
-        Name = "No media playing";
-        Icon = new("");
-    }
-    public override ActionResult Invoke()
-    {
-        if (mediaSession != null) {
-            _ = mediaSession.TryTogglePlayPauseAsync();
-        }
-        return ActionResult.KeepOpen();
-    }
-}
-internal sealed class MediaListItem : ListItem
-{
-    private GlobalSystemMediaTransportControlsSession mediaSession;
-    public MediaListItem() : base(new TogglePlayMediaAction())
-    {
-        var task = GlobalSystemMediaTransportControlsSessionManager.RequestAsync().AsTask();
-        task.ContinueWith(async t =>  {
-            var manager = t.Result;
-            mediaSession = manager.GetCurrentSession();
-            ((TogglePlayMediaAction)this.Command).mediaSession = mediaSession;
-            mediaSession.MediaPropertiesChanged += MediaSession_MediaPropertiesChanged;
-            mediaSession.PlaybackInfoChanged += MediaSession_PlaybackInfoChanged;
-            // mediaSession.TimelinePropertiesChanged += MediaSession_TimelinePropertiesChanged;
-            await this.UpdateProperties();
-        });
-        // task.Start();
-
-        this._MoreCommands = null;
-    }
-    private async Task UpdateProperties() {
-        var properties = await this.mediaSession.TryGetMediaPropertiesAsync().AsTask();
-        if (properties == null)
-        {
-            var a = ((TogglePlayMediaAction)this.Command);
-            a.Icon = new("");
-            a.Name = "No media playing";
-            return;
-        }
-
-        this.Title = properties.Title;
-        // hack
-        ((TogglePlayMediaAction)this.Command).Name = this.Title;
-        this.Subtitle = properties.Artist;
-        var status = mediaSession.GetPlaybackInfo().PlaybackStatus;
-
-        var internalAction = ((TogglePlayMediaAction)this.Command);
-        if (status == GlobalSystemMediaTransportControlsSessionPlaybackStatus.Paused)
-        {
-            internalAction.Icon = new("\ue768"); //play
-            internalAction.Name = "Paused";
-        }
-        else if (status == GlobalSystemMediaTransportControlsSessionPlaybackStatus.Playing)
-        {
-            internalAction.Icon = new("\ue769"); //pause
-            internalAction.Name = "Playing";
-        }
-
-        this.MoreCommands = [
-            new CommandContextItem(new PrevNextTrackAction(true, mediaSession)),
-            new CommandContextItem(new PrevNextTrackAction(false, mediaSession))
-        ];
-    }
-    private void MediaSession_TimelinePropertiesChanged(GlobalSystemMediaTransportControlsSession sender, TimelinePropertiesChangedEventArgs args)
-    {
-        _ = UpdateProperties();
-    }
-    private void MediaSession_PlaybackInfoChanged(GlobalSystemMediaTransportControlsSession sender, PlaybackInfoChangedEventArgs args)
-    {
-        _ = UpdateProperties();
-    }
-    private void MediaSession_MediaPropertiesChanged(GlobalSystemMediaTransportControlsSession sender, MediaPropertiesChangedEventArgs args)
-    {
-        _ = UpdateProperties();
-    }
-}
-
 public class MediaActionsProvider : ICommandProvider
 {
     public string DisplayName => $"Media controls actions";
-    public IconDataType Icon => new("");
 
-    private readonly IListItem[] _Actions = [
+    public IconDataType Icon => new(string.Empty);
+
+    private readonly IListItem[] _actions = [
         new MediaListItem()
     ];
 
 #pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
     public void Dispose() => throw new NotImplementedException();
 #pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
 
-
     public IListItem[] TopLevelCommands()
     {
-        return _Actions;
+        return _actions;
     }
 }
-

src/modules/cmdpal/extensions/MediaControlsExtension/MediaControlsExtension.csproj

@@ -7,7 +7,6 @@
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>false</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
-	<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

src/modules/cmdpal/extensions/MediaControlsExtension/MediaListItem.cs

@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.Windows.CommandPalette.Extensions.Helpers;
+using Windows.Media.Control;
+
+namespace MediaControlsExtension;
+
+internal sealed class MediaListItem : ListItem
+{
+    private GlobalSystemMediaTransportControlsSession _mediaSession;
+
+    public MediaListItem()
+        : base(new TogglePlayMediaAction())
+    {
+        var task = GlobalSystemMediaTransportControlsSessionManager.RequestAsync().AsTask();
+        task.ContinueWith(async t =>
+        {
+            var manager = t.Result;
+            _mediaSession = manager.GetCurrentSession();
+            ((TogglePlayMediaAction)this.Command).MediaSession = _mediaSession;
+
+            _mediaSession.MediaPropertiesChanged += MediaSession_MediaPropertiesChanged;
+            _mediaSession.PlaybackInfoChanged += MediaSession_PlaybackInfoChanged;
+
+            // mediaSession.TimelinePropertiesChanged += MediaSession_TimelinePropertiesChanged;
+            await this.UpdateProperties();
+        });
+
+        // task.Start();
+        this._MoreCommands = null;
+    }
+
+    private async Task UpdateProperties()
+    {
+        var properties = await this._mediaSession.TryGetMediaPropertiesAsync().AsTask();
+
+        if (properties == null)
+        {
+            var a = (TogglePlayMediaAction)this.Command;
+            a.Icon = new(string.Empty);
+            a.Name = "No media playing";
+
+            return;
+        }
+
+        this.Title = properties.Title;
+
+        // hack
+        ((TogglePlayMediaAction)this.Command).Name = this.Title;
+        this.Subtitle = properties.Artist;
+        var status = _mediaSession.GetPlaybackInfo().PlaybackStatus;
+
+        var internalAction = (TogglePlayMediaAction)this.Command;
+        if (status == GlobalSystemMediaTransportControlsSessionPlaybackStatus.Paused)
+        {
+            internalAction.Icon = new("\ue768"); // play
+            internalAction.Name = "Paused";
+        }
+        else if (status == GlobalSystemMediaTransportControlsSessionPlaybackStatus.Playing)
+        {
+            internalAction.Icon = new("\ue769"); // pause
+            internalAction.Name = "Playing";
+        }
+
+        MoreCommands = [
+            new CommandContextItem(new PrevNextTrackAction(true, _mediaSession)),
+            new CommandContextItem(new PrevNextTrackAction(false, _mediaSession))
+        ];
+    }
+
+    private void MediaSession_TimelinePropertiesChanged(GlobalSystemMediaTransportControlsSession sender, TimelinePropertiesChangedEventArgs args)
+    {
+        _ = UpdateProperties();
+    }
+
+    private void MediaSession_PlaybackInfoChanged(GlobalSystemMediaTransportControlsSession sender, PlaybackInfoChangedEventArgs args)
+    {
+        _ = UpdateProperties();
+    }
+
+    private void MediaSession_MediaPropertiesChanged(GlobalSystemMediaTransportControlsSession sender, MediaPropertiesChangedEventArgs args)
+    {
+        _ = UpdateProperties();
+    }
+}

src/modules/cmdpal/extensions/MediaControlsExtension/PrevNextTrackAction.cs

@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Windows.CommandPalette.Extensions;
+using Microsoft.Windows.CommandPalette.Extensions.Helpers;
+using Windows.Media.Control;
+
+namespace MediaControlsExtension;
+
+internal sealed class PrevNextTrackAction : InvokableCommand
+{
+    private readonly GlobalSystemMediaTransportControlsSession _mediaSession;
+    private readonly bool _previous;
+
+    public PrevNextTrackAction(bool previous, GlobalSystemMediaTransportControlsSession s)
+    {
+        _mediaSession = s;
+        _previous = previous;
+
+        if (previous)
+        {
+            Name = "Previous track";
+            Icon = new("\ue892");
+        }
+        else
+        {
+            Name = "Next track";
+            Icon = new("\ue893");
+        }
+    }
+
+    public override ICommandResult Invoke()
+    {
+        if (_previous)
+        {
+            _ = _mediaSession.TrySkipPreviousAsync();
+        }
+        else
+        {
+            _ = _mediaSession.TrySkipNextAsync();
+        }
+
+        return ActionResult.KeepOpen();
+    }
+}

src/modules/cmdpal/extensions/MediaControlsExtension/TogglePlayMediaAction.cs

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Windows.CommandPalette.Extensions.Helpers;
+using Windows.Media.Control;
+
+namespace MediaControlsExtension;
+
+public sealed class TogglePlayMediaAction : InvokableCommand
+{
+    public GlobalSystemMediaTransportControlsSession MediaSession { get; set; }
+
+    public TogglePlayMediaAction()
+    {
+        Name = "No media playing";
+        Icon = new(string.Empty);
+    }
+
+    public override ActionResult Invoke()
+    {
+        if (MediaSession != null)
+        {
+            _ = MediaSession.TryTogglePlayPauseAsync();
+        }
+
+        return ActionResult.KeepOpen();
+    }
+}