Merge pull request #603 from unoplatform/chore/update.tube.player

chore: (Tube Player) move logic to service

Author: nickrandolph

reference/TubePlayer/TubePlayer/Business/IYoutubeService.cs

@@ -3,4 +3,6 @@ namespace TubePlayer.Business;
 public interface IYoutubeService
 {
     Task<YoutubeVideoSet> SearchVideos(string searchQuery, string nextPageToken, uint maxResult, CancellationToken ct);
+
+    Task<string?> GetVideoSourceUrl(string videoId, CancellationToken ct);
 }

reference/TubePlayer/TubePlayer/Business/YoutubeService.cs

@@ -1,17 +1,10 @@
 namespace TubePlayer.Business;
 
-public class YoutubeService : IYoutubeService
+public class YoutubeService(IYoutubeEndpoint client, IYoutubePlayerEndpoint playerClient) : IYoutubeService
 {
-    private readonly IYoutubeEndpoint _client;
-
-    public YoutubeService(IYoutubeEndpoint client)
-    {
-        _client = client;
-    }
-
     public async Task<YoutubeVideoSet> SearchVideos(string searchQuery, string nextPageToken, uint maxResult, CancellationToken ct)
     {
-        var resultData = await _client.SearchVideos(searchQuery, nextPageToken, maxResult, ct);
+        var resultData = await client.SearchVideos(searchQuery, nextPageToken, maxResult, ct);
 
         var results = resultData?.Items?.Where(result =>
             !string.IsNullOrWhiteSpace(result.Snippet?.ChannelId)
@@ -33,8 +26,8 @@ public async Task<YoutubeVideoSet> SearchVideos(string searchQuery, string nextP
             .Distinct(StringComparer.OrdinalIgnoreCase)
             .ToArray();
 
-        var asyncDetails = _client.GetVideoDetails(videoIds, ct);
-        var asyncChannels = _client.GetChannels(channelIds, ct);
+        var asyncDetails = client.GetVideoDetails(videoIds, ct);
+        var asyncChannels = client.GetChannels(channelIds, ct);
         await Task.WhenAll(asyncDetails, asyncChannels);
 
         var detailsItems = (await asyncDetails)?.Items;
@@ -67,4 +60,39 @@ public async Task<YoutubeVideoSet> SearchVideos(string searchQuery, string nextP
 
         return new(videoSet.ToImmutableList(), resultData?.NextPageToken ?? string.Empty);
     }
+
+
+    public async Task<string?> GetVideoSourceUrl(string videoId, CancellationToken ct)
+    {
+        var streamVideo = $$"""
+                {
+                    "videoId": "{{videoId}}",
+                    "context": {
+                        "client": {
+                            "clientName": "ANDROID_TESTSUITE",
+                            "clientVersion": "1.9",
+                            "androidSdkVersion": 30,
+                            "hl": "en",
+                            "gl": "US",
+                            "utcOffsetMinutes": 0
+                        }
+                    }
+                }
+                """;
+
+        // Get the available stream data
+        var streamData = await playerClient.GetStreamData(streamVideo, ct);
+
+        // Get the video stream with the highest video quality
+        var streamWithHighestVideoQuality = streamData.Content?.
+                                                        StreamingData?
+                                                        .Formats?
+                                                        .OrderByDescending(s => s.QualityLabel)
+                                                        .FirstOrDefault();
+
+        // Get the stream URL
+        var streamUrl = streamWithHighestVideoQuality?.Url;
+
+        return streamUrl;
+    }
 }

reference/TubePlayer/TubePlayer/Business/YoutubeServiceMock.cs

@@ -15,6 +15,11 @@ public YoutubeServiceMock(ISerializer serializer)
         _channels = channelsData.Items!.ToDictionary(channel => channel.Id!, StringComparer.OrdinalIgnoreCase);
     }
 
+    public Task<string?> GetVideoSourceUrl(string videoId, CancellationToken ct)
+    {
+        return Task.FromResult<string?>(default);
+    }
+
     public Task<YoutubeVideoSet> SearchVideos(string searchQuery, string nextPageToken, uint maxResult, CancellationToken ct)
     {
         var filtered = _details

reference/TubePlayer/TubePlayer/Presentation/VideoDetailsModel.cs

@@ -1,41 +1,17 @@
 using Windows.Media.Core;
-using TubePlayer.Services;
 
 namespace TubePlayer.Presentation;
 
-public partial record VideoDetailsModel(YoutubeVideo Video, IYoutubePlayerEndpoint YoutubeClient)
+public partial record VideoDetailsModel(YoutubeVideo Video, IYoutubeService YoutubeService)
 {
     public IFeed<MediaSource> VideoSource => Feed.Async(GetVideoSource);
 
     private async ValueTask<MediaSource> GetVideoSource(CancellationToken ct)
     {
-        var streamVideo = $$"""
-                {
-                    "videoId": "{{Video.Id}}",
-                    "context": {
-                        "client": {
-                            "clientName": "ANDROID_TESTSUITE",
-                            "clientVersion": "1.9",
-                            "androidSdkVersion": 30,
-                            "hl": "en",
-                            "gl": "US",
-                            "utcOffsetMinutes": 0
-                        }
-                    }
-                }
-                """;
-
-        // Get the available stream data
-        var streamData = await YoutubeClient.GetStreamData(streamVideo, ct);
-
-        // Get the video stream with the highest video quality
-        var streamWithHighestVideoQuality = streamData.Content?.StreamingData?.Formats?.OrderByDescending(s => s.QualityLabel).FirstOrDefault() ??
-            throw new InvalidOperationException("Input stream collection is empty.");
-
-        // Get the stream URL
-        var streamUrl = streamWithHighestVideoQuality.Url;
+        var streamUrl = await YoutubeService.GetVideoSourceUrl(Video?.Id, ct) 
+            ?? throw new InvalidOperationException("Input stream collection is empty.");
 
         // Return the MediaSource using the stream URL
-        return MediaSource.CreateFromUri(new Uri(streamUrl!));
+        return MediaSource.CreateFromUri(new Uri(streamUrl));
     }
 }