Handle "free with ads movie" videos

Closes #728
Tyrrrz · Aug 18, 2023 · 987be5b · 987be5b
1 parent 008ae39
commit 987be5b
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 8 deletions.
diff --git a/YoutubeExplode.Tests/ChannelSpecs.cs b/YoutubeExplode.Tests/ChannelSpecs.cs
@@ -73,6 +73,24 @@ public async Task I_can_get_the_metadata_of_a_channel_by_handle()
         channel.Thumbnails.Should().NotBeEmpty();
     }
 
+    [Theory]
+    [InlineData(ChannelIds.Normal)]
+    [InlineData(ChannelIds.Movies)]
+    public async Task I_can_get_the_metadata_of_any_available_channel(string channelId)
+    {
+        // Arrange
+        var youtube = new YoutubeClient();
+
+        // Act
+        var channel = await youtube.Channels.GetAsync(channelId);
+
+        // Assert
+        channel.Id.Value.Should().Be(channelId);
+        channel.Url.Should().NotBeNullOrWhiteSpace();
+        channel.Title.Should().NotBeNullOrWhiteSpace();
+        channel.Thumbnails.Should().NotBeEmpty();
+    }
+
     [Fact]
     public async Task I_can_get_videos_uploaded_by_a_channel()
     {

diff --git a/YoutubeExplode.Tests/TestData/ChannelIds.cs b/YoutubeExplode.Tests/TestData/ChannelIds.cs
@@ -3,4 +3,5 @@
 internal static class ChannelIds
 {
     public const string Normal = "UCX6OQ3DkcsbYNE6H8uQQuVA";
+    public const string Movies = "UCuVPpxrm2VAgpH3Ktln4HXg";
 }
diff --git a/YoutubeExplode/Channels/ChannelClient.cs b/YoutubeExplode/Channels/ChannelClient.cs
@@ -65,8 +65,26 @@ private Channel Get(ChannelPage channelPage)
     /// </summary>
     public async ValueTask<Channel> GetAsync(
         ChannelId channelId,
-        CancellationToken cancellationToken = default) =>
-        Get(await _controller.GetChannelPageAsync(channelId, cancellationToken));
+        CancellationToken cancellationToken = default)
+    {
+        // Special case for the "Movies & TV" channel, which has a custom page
+        if (channelId == "UCuVPpxrm2VAgpH3Ktln4HXg")
+        {
+            return new Channel(
+                "UCuVPpxrm2VAgpH3Ktln4HXg",
+                "Movies & TV",
+                new[]
+                {
+                    new Thumbnail(
+                        "https://www.gstatic.com/youtube/img/tvfilm/clapperboard_profile.png",
+                        new Resolution(1024, 1024)
+                    )
+                }
+            );
+        }
+
+        return Get(await _controller.GetChannelPageAsync(channelId, cancellationToken));
+    }
 
     /// <summary>
     /// Gets the metadata associated with the channel of the specified user.

diff --git a/YoutubeExplode/Videos/Streams/StreamClient.cs b/YoutubeExplode/Videos/Streams/StreamClient.cs
@@ -201,13 +201,26 @@ private async IAsyncEnumerable<IStreamInfo> GetStreamInfosAsync(
         // Extract streams from the DASH manifest
         if (!string.IsNullOrWhiteSpace(playerResponse.DashManifestUrl))
         {
-            var dashManifest = await _controller.GetDashManifestAsync(
-                playerResponse.DashManifestUrl,
-                cancellationToken
-            );
+            var dashManifest = default(DashManifest?);
 
-            await foreach (var streamInfo in GetStreamInfosAsync(dashManifest.Streams, cancellationToken))
-                yield return streamInfo;
+            try
+            {
+                dashManifest = await _controller.GetDashManifestAsync(
+                    playerResponse.DashManifestUrl,
+                    cancellationToken
+                );
+            }
+            // Some DASH manifest URLs return 404 for whatever reason
+            // https://github.com/Tyrrrz/YoutubeExplode/issues/728
+            catch (HttpRequestException)
+            {
+            }
+
+            if (dashManifest is not null)
+            {
+                await foreach (var streamInfo in GetStreamInfosAsync(dashManifest.Streams, cancellationToken))
+                    yield return streamInfo;
+            }
         }
     }