Merge pull request #13 from lay295/master

sync
lay295 · Dec 9, 2023 · 2e1a47d · 2e1a47d
2 parents 4aa7309 + dd5557d
commit 2e1a47d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/TwitchDownloaderCore.Tests/TimeSpanHFormatTests.cs b/TwitchDownloaderCore.Tests/TimeSpanHFormatTests.cs
@@ -227,8 +227,8 @@ public void ThrowsOnImbalancedQuoteMarkEscaping_WhenHoursUnder24()
             var exception = Assert.Throws(expectedExceptionType, () => TimeSpanHFormat.ReusableInstance.Format(FORMAT_STRING, timeSpan));
 
             // Ensure the FormatException originated from TimeSpanHFormat and not TimeSpan.ToString()
+            Assert.IsType<FormatException>(exception);
             Assert.Equal(EXPECTED_SOURCE_NAME, exception.Source);
-            Assert.Equal($"Invalid character escaping in the format string: {FORMAT_STRING}", exception.Message);
         }
 
         [Fact]
@@ -242,6 +242,7 @@ public void ThrowsOnImbalancedQuoteMarkEscaping_When24HoursOrMore()
             var exception = Assert.Throws(expectedExceptionType, () => TimeSpanHFormat.ReusableInstance.Format(FORMAT_STRING, timeSpan));
 
             // Ensure the FormatException originated from TimeSpanHFormat and not TimeSpan.ToString()
+            Assert.IsType<FormatException>(exception);
             Assert.Equal(EXPECTED_SOURCE_NAME, exception.Source);
         }
     }

diff --git a/TwitchDownloaderCore/ChatDownloader.cs b/TwitchDownloaderCore/ChatDownloader.cs
@@ -151,7 +151,7 @@ private static List<Comment> ConvertComments(CommentVideo video, ChatFormat form
                     content_offset_seconds = oldComment.contentOffsetSeconds,
                     commenter = new Commenter
                     {
-                        display_name = oldComment.commenter.displayName,
+                        display_name = oldComment.commenter.displayName.Trim(),
                         _id = oldComment.commenter.id,
                         name = oldComment.commenter.login
                     }

diff --git a/TwitchDownloaderCore/Tools/TimeSpanHFormat.cs b/TwitchDownloaderCore/Tools/TimeSpanHFormat.cs
@@ -6,7 +6,6 @@ namespace TwitchDownloaderCore.Tools
 {
     /// <summary>Adds an 'H' parameter to <see cref="TimeSpan"/> string formatting. The 'H' parameter is equivalent to flooring <see cref="TimeSpan"/>.<see cref="TimeSpan.TotalHours"/>.</summary>
     /// <remarks>
-    /// This formatter only supports escaping 'H's via '\'.
     /// For optimal memory performance, resulting strings split about any 'H' parameters should be less than 256.
     /// </remarks>
     public class TimeSpanHFormat : IFormatProvider, ICustomFormatter

diff --git a/TwitchDownloaderCore/VideoDownloader.cs b/TwitchDownloaderCore/VideoDownloader.cs
@@ -560,7 +560,7 @@ private static async Task DownloadVideoPartAsync(HttpClient httpClient, Uri base
             }
 
             string[] videoPlaylist = await TwitchHelper.GetVideoPlaylist(downloadOptions.Id, accessToken.data.videoPlaybackAccessToken.value, accessToken.data.videoPlaybackAccessToken.signature);
-            if (videoPlaylist[0].Contains("vod_manifest_restricted"))
+            if (videoPlaylist[0].Contains("vod_manifest_restricted") || videoPlaylist[0].Contains("unauthorized_entitlements"))
             {
                 throw new NullReferenceException("Insufficient access to VOD, OAuth may be required.");
             }

diff --git a/TwitchDownloaderWPF/PageVodDownload.xaml.cs b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
@@ -14,7 +14,6 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using TwitchDownloaderCore;
-using TwitchDownloaderCore.Extensions;
 using TwitchDownloaderCore.Options;
 using TwitchDownloaderCore.Tools;
 using TwitchDownloaderCore.TwitchObjects.Gql;
@@ -99,8 +98,6 @@ private async Task GetVideoInfo()
                     throw new NullReferenceException("Invalid VOD, deleted/expired VOD possibly?");
                 }
 
-                Task<string[]> taskPlaylist = TwitchHelper.GetVideoPlaylist(videoId, taskAccessToken.Result.data.videoPlaybackAccessToken.value, taskAccessToken.Result.data.videoPlaybackAccessToken.signature);
-
                 var thumbUrl = taskVideoInfo.Result.data.video.thumbnailURLs.FirstOrDefault();
                 if (!ThumbnailService.TryGetThumb(thumbUrl, out var image))
                 {
@@ -111,8 +108,9 @@ private async Task GetVideoInfo()
 
                 comboQuality.Items.Clear();
                 videoQualities.Clear();
-                string[] playlist = await taskPlaylist;
-                if (playlist[0].Contains("vod_manifest_restricted"))
+
+                var playlist = await TwitchHelper.GetVideoPlaylist(videoId, taskAccessToken.Result.data.videoPlaybackAccessToken.value, taskAccessToken.Result.data.videoPlaybackAccessToken.signature);
+                if (playlist[0].Contains("vod_manifest_restricted") || playlist[0].Contains("unauthorized_entitlements"))
                 {
                     throw new NullReferenceException(Translations.Strings.InsufficientAccessMayNeedOauth);
                 }