Set content-type: application/rss+xml

i3arnon · Nov 6, 2020 · c6a89c3 · c6a89c3
1 parent 7c65a91
commit c6a89c3
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 49 deletions.
diff --git a/src/Service/YoutubeFeed.cs b/src/Service/YoutubeFeed.cs
@@ -48,30 +48,32 @@ public async Task<SyndicationFeedFormatter> GetUserFeedAsync(
             int maxLength,
             bool isPopular)
         {
-            var baseAddress = GetBaseAddress();
-
-            var channel = 
-                await GetChannelAsync(userId) ?? 
-                await FindChannelAsync(userId);
-            var arguments = new Arguments(
-                channel.ContentDetails.RelatedPlaylists.Uploads,
-                encoding,
-                maxLength,
-                isPopular);
-
-            var feed = new ItunesFeed(
-                GetTitle(channel.Snippet.Title, arguments),
-                channel.Snippet.Description,
-                new Uri(string.Format(_channelUrlFormat, channel.Id)))
-            {
-                ImageUrl = new Uri(channel.Snippet.Thumbnails.Medium.Url),
-                Items = await GenerateItemsAsync(
-                    baseAddress,
-                    channel.Snippet.PublishedAt.GetValueOrDefault(),
-                    arguments),
-            };
+            return await GetFeedFormatterAsync(GetFeedAsync);
 
-            return feed.GetRss20Formatter();
+            async Task<ItunesFeed> GetFeedAsync(string baseAddress)
+            {
+                var channel =
+                    await GetChannelAsync(userId) ??
+                    await FindChannelAsync(userId);
+
+                var arguments = new Arguments(
+                    channel.ContentDetails.RelatedPlaylists.Uploads,
+                    encoding,
+                    maxLength,
+                    isPopular);
+
+                return new ItunesFeed(
+                    GetTitle(channel.Snippet.Title, arguments),
+                    channel.Snippet.Description,
+                    new Uri(string.Format(_channelUrlFormat, channel.Id)))
+                {
+                    ImageUrl = new Uri(channel.Snippet.Thumbnails.Medium.Url),
+                    Items = await GenerateItemsAsync(
+                        baseAddress,
+                        channel.Snippet.PublishedAt.GetValueOrDefault(),
+                        arguments)
+                };
+            }
 
             async Task<Channel> GetChannelAsync(string id)
             {
@@ -102,33 +104,35 @@ public async Task<SyndicationFeedFormatter> GetPlaylistFeedAsync(
             int maxLength,
             bool isPopular)
         {
-            var baseAddress = GetBaseAddress();
+            return await GetFeedFormatterAsync(GetFeedAsync);
 
-            var arguments = new Arguments(
-                playlistId,
-                encoding,
-                maxLength,
-                isPopular);
-
-            var playlistRequest = _youtubeService.Playlists.List("snippet");
-            playlistRequest.Id = playlistId;
-            playlistRequest.MaxResults = 1;
-
-            var playlist = (await playlistRequest.ExecuteAsync()).Items.First();
-
-            var feed = new ItunesFeed(
-                GetTitle(playlist.Snippet.Title, arguments),
-                playlist.Snippet.Description,
-                new Uri(string.Format(_playlistUrlFormat, playlist.Id)))
+            async Task<ItunesFeed> GetFeedAsync(string baseAddress)
             {
-                ImageUrl = new Uri(playlist.Snippet.Thumbnails.Medium.Url),
-                Items = await GenerateItemsAsync(
-                    baseAddress,
-                    playlist.Snippet.PublishedAt.GetValueOrDefault(),
-                    arguments),
-            };
-
-            return feed.GetRss20Formatter();
+                var arguments =
+                    new Arguments(
+                        playlistId,
+                        encoding,
+                        maxLength,
+                        isPopular);
+
+                var playlistRequest = _youtubeService.Playlists.List("snippet");
+                playlistRequest.Id = playlistId;
+                playlistRequest.MaxResults = 1;
+
+                var playlist = (await playlistRequest.ExecuteAsync()).Items.First();
+
+                return new ItunesFeed(
+                    GetTitle(playlist.Snippet.Title, arguments),
+                    playlist.Snippet.Description,
+                    new Uri(string.Format(_playlistUrlFormat, playlist.Id)))
+                {
+                    ImageUrl = new Uri(playlist.Snippet.Thumbnails.Medium.Url),
+                    Items = await GenerateItemsAsync(
+                        baseAddress,
+                        playlist.Snippet.PublishedAt.GetValueOrDefault(),
+                        arguments)
+                };
+            }
         }
 
         public async Task GetVideoAsync(string videoId, string encoding)
@@ -170,6 +174,17 @@ async Task<string> GetAudioUriAsync()
             }
         }
 
+        private async Task<SyndicationFeedFormatter> GetFeedFormatterAsync(Func<string, Task<ItunesFeed>> getFeedAsync)
+        {
+            var transportAddress = OperationContext.Current.IncomingMessageProperties.Via;
+            var baseAddress = $"http://{transportAddress.DnsSafeHost}:{transportAddress.Port}/FeedService";
+
+            WebOperationContext.Current.OutgoingResponse.ContentType = "application/rss+xml; charset=utf-8";
+
+            var feed = await getFeedAsync(baseAddress);
+            return feed.GetRss20Formatter();
+        }
+
         private async Task GetContentAsync(Func<Task<string>> getContentUriAsync)
         {
             var context = WebOperationContext.Current;

diff --git a/src/YouCast/MainWindow.xaml b/src/YouCast/MainWindow.xaml
@@ -178,7 +178,7 @@
                     <Button 
                         x:Name="YoucastLink" 
                         Style="{StaticResource LinkButton}"  
-                        Click="YoucastLink_OnClick" Content="YouCast v2.16."/>
+                        Click="YoucastLink_OnClick" Content="YouCast v2.17."/>
                     <Label VerticalAlignment="Center" Content="Made by"/>
                     <Button 
                         x:Name="TwitterLink"