Skip to content

Commit 49709e0

Browse files
ScrubNScrubN
committed
Vastly reduce the time taken to cancel chat renders and chat downloads during image fetching, and chat updates in general
1 parent 3296002 commit 49709e0

File tree

4 files changed

+37
-8
lines changed

4 files changed

+37
-8
lines changed

‎TwitchDownloaderCore/ChatDownloader.cs

+8-2
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,6 @@ public async Task DownloadAsync(CancellationToken cancellationToken)
409409
List<CheerEmote> twitchBits = await TwitchHelper.GetBits(chatRoot.comments, downloadOptions.TempFolder, chatRoot.streamer.id.ToString(), cancellationToken: cancellationToken);
410410
_progress.ReportProgress(50);
411411

412-
cancellationToken.ThrowIfCancellationRequested();
413-
414412
var totalImageCount = thirdPartyEmotes.Count + firstPartyEmotes.Count + twitchBadges.Count + twitchBits.Count;
415413
var imagesProcessed = 0;
416414

@@ -427,6 +425,8 @@ public async Task DownloadAsync(CancellationToken cancellationToken)
427425
_progress.ReportProgress(++imagesProcessed * 100 / totalImageCount + 50);
428426
}
429427

428+
cancellationToken.ThrowIfCancellationRequested();
429+
430430
foreach (TwitchEmote emote in firstPartyEmotes)
431431
{
432432
EmbedEmoteData newEmote = new EmbedEmoteData();
@@ -440,6 +440,8 @@ public async Task DownloadAsync(CancellationToken cancellationToken)
440440
_progress.ReportProgress(++imagesProcessed * 100 / totalImageCount + 50);
441441
}
442442

443+
cancellationToken.ThrowIfCancellationRequested();
444+
443445
foreach (ChatBadge badge in twitchBadges)
444446
{
445447
EmbedChatBadge newBadge = new EmbedChatBadge();
@@ -449,6 +451,8 @@ public async Task DownloadAsync(CancellationToken cancellationToken)
449451
_progress.ReportProgress(++imagesProcessed * 100 / totalImageCount + 50);
450452
}
451453

454+
cancellationToken.ThrowIfCancellationRequested();
455+
452456
foreach (CheerEmote bit in twitchBits)
453457
{
454458
EmbedCheerEmote newBit = new EmbedCheerEmote();
@@ -470,6 +474,8 @@ public async Task DownloadAsync(CancellationToken cancellationToken)
470474
}
471475
}
472476

477+
cancellationToken.ThrowIfCancellationRequested();
478+
473479
if (downloadOptions.DownloadFormat is ChatFormat.Json)
474480
{
475481
//Best effort, but if we fail oh well

‎TwitchDownloaderCore/ChatRenderer.cs

+10
Original file line numberDiff line numberDiff line change
@@ -1622,6 +1622,8 @@ private async Task<List<ChatBadge>> GetScaledBadges(CancellationToken cancellati
16221622

16231623
foreach (var badge in badgeTask)
16241624
{
1625+
cancellationToken.ThrowIfCancellationRequested();
1626+
16251627
// Assume badges are always 2x scale, not 1x or 4x
16261628
var newScale = renderOptions.ReferenceScale * renderOptions.BadgeScale;
16271629
if (Math.Abs(newScale - 1.0) > 0.01)
@@ -1639,6 +1641,8 @@ private async Task<List<TwitchEmote>> GetScaledEmotes(CancellationToken cancella
16391641

16401642
foreach (var emote in emoteTask)
16411643
{
1644+
cancellationToken.ThrowIfCancellationRequested();
1645+
16421646
// Assume emojis are 4x scale
16431647
double newScale = emote.ImageScale * 0.5 * renderOptions.ReferenceScale * renderOptions.EmoteScale;
16441648
if (Math.Abs(newScale - 1.0) > 0.01)
@@ -1657,6 +1661,8 @@ private async Task<List<TwitchEmote>> GetScaledThirdEmotes(CancellationToken can
16571661

16581662
foreach (var emote in emoteThirdTask)
16591663
{
1664+
cancellationToken.ThrowIfCancellationRequested();
1665+
16601666
// Assume emojis are 4x scale
16611667
double newScale = emote.ImageScale * 0.5 * renderOptions.ReferenceScale * renderOptions.EmoteScale;
16621668
if (Math.Abs(newScale - 1.0) > 0.01)
@@ -1674,6 +1680,8 @@ private async Task<List<CheerEmote>> GetScaledBits(CancellationToken cancellatio
16741680

16751681
foreach (var cheer in cheerTask)
16761682
{
1683+
cancellationToken.ThrowIfCancellationRequested();
1684+
16771685
//Assume cheermotes are always 2x scale, not 1x or 4x
16781686
var newScale = renderOptions.ReferenceScale * renderOptions.EmoteScale;
16791687
if (Math.Abs(newScale - 1.0) > 0.01)
@@ -1696,6 +1704,8 @@ private async Task<Dictionary<string, SKBitmap>> GetScaledEmojis(CancellationTok
16961704
string[] emojiKeys = emojis.Keys.ToArray();
16971705
foreach (var emojiKey in emojiKeys)
16981706
{
1707+
cancellationToken.ThrowIfCancellationRequested();
1708+
16991709
SKBitmap bitmap = emojis[emojiKey];
17001710
SKImageInfo oldEmojiInfo = bitmap.Info;
17011711
SKImageInfo imageInfo = new SKImageInfo((int)(oldEmojiInfo.Width * emojiScale), (int)(oldEmojiInfo.Height * emojiScale));

‎TwitchDownloaderCore/ChatUpdater.cs

+6
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ public async Task UpdateAsync(CancellationToken cancellationToken)
8585

8686
private async Task UpdateVideoInfo(int totalSteps, int currentStep, CancellationToken cancellationToken)
8787
{
88+
cancellationToken.ThrowIfCancellationRequested();
89+
8890
_progress.SetStatus($"Updating Video Info [{currentStep}/{totalSteps}]");
8991
_progress.ReportProgress(currentStep * 100 / totalSteps);
9092

@@ -175,6 +177,8 @@ private async Task UpdateVideoInfo(int totalSteps, int currentStep, Cancellation
175177

176178
private async Task UpdateChatTrim(int totalSteps, int currentStep, CancellationToken cancellationToken)
177179
{
180+
cancellationToken.ThrowIfCancellationRequested();
181+
178182
_progress.SetStatus($"Updating Chat Trim [{currentStep}/{totalSteps}]");
179183
_progress.ReportProgress(currentStep * 100 / totalSteps);
180184

@@ -220,6 +224,8 @@ private async Task UpdateChatTrim(int totalSteps, int currentStep, CancellationT
220224

221225
private async Task UpdateEmbeds(int currentStep, int totalSteps, CancellationToken cancellationToken)
222226
{
227+
cancellationToken.ThrowIfCancellationRequested();
228+
223229
_progress.SetStatus($"Updating Embeds [{currentStep}/{totalSteps}]");
224230
_progress.ReportProgress(currentStep * 100 / totalSteps);
225231

‎TwitchDownloaderCore/TwitchHelper.cs

+13-6
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,8 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> co
367367
{
368368
foreach (EmbedEmoteData emoteData in embeddedData.thirdParty)
369369
{
370+
cancellationToken.ThrowIfCancellationRequested();
371+
370372
try
371373
{
372374
TwitchEmote newEmote = new TwitchEmote(emoteData.data, EmoteProvider.ThirdParty, emoteData.imageScale, emoteData.id, emoteData.name);
@@ -405,8 +407,6 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> co
405407
}
406408
}
407409

408-
cancellationToken.ThrowIfCancellationRequested();
409-
410410
if (ffz)
411411
{
412412
try
@@ -419,8 +419,6 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> co
419419
}
420420
}
421421

422-
cancellationToken.ThrowIfCancellationRequested();
423-
424422
if (stv)
425423
{
426424
try
@@ -489,6 +487,8 @@ public static async Task<List<TwitchEmote>> GetEmotes(List<Comment> comments, st
489487
{
490488
foreach (EmbedEmoteData emoteData in embeddedData.firstParty)
491489
{
490+
cancellationToken.ThrowIfCancellationRequested();
491+
492492
try
493493
{
494494
TwitchEmote newEmote = new TwitchEmote(emoteData.data, EmoteProvider.FirstParty, emoteData.imageScale, emoteData.id, emoteData.name);
@@ -615,6 +615,8 @@ public static async Task<List<ChatBadge>> GetChatBadges(List<Comment> comments,
615615
{
616616
foreach (EmbedChatBadge data in embeddedData.twitchBadges)
617617
{
618+
cancellationToken.ThrowIfCancellationRequested();
619+
618620
try
619621
{
620622
ChatBadge newBadge = new ChatBadge(data.name, data.versions);
@@ -703,8 +705,9 @@ public static async Task<Dictionary<string, SKBitmap>> GetEmojis(string cacheFol
703705

704706
foreach (var emoji in emojis)
705707
{
706-
var filePath = Path.Combine(emojiFolder,
707-
emoji.Name.ToUpper().Replace(emojiVendor.UnicodeSequenceSeparator(), ' '));
708+
cancellationToken.ThrowIfCancellationRequested();
709+
710+
var filePath = Path.Combine(emojiFolder, emoji.Name.ToUpper().Replace(emojiVendor.UnicodeSequenceSeparator(), ' '));
708711
if (!File.Exists(filePath))
709712
{
710713
try
@@ -730,6 +733,8 @@ public static async Task<Dictionary<string, SKBitmap>> GetEmojis(string cacheFol
730733
var failedToDecode = 0;
731734
foreach (var emojiPath in emojiFiles)
732735
{
736+
cancellationToken.ThrowIfCancellationRequested();
737+
733738
await using var fs = File.OpenRead(emojiPath);
734739
var emojiImage = SKBitmap.Decode(fs);
735740

@@ -761,6 +766,8 @@ public static async Task<List<CheerEmote>> GetBits(List<Comment> comments, strin
761766
{
762767
foreach (EmbedCheerEmote data in embeddedData.twitchBits)
763768
{
769+
cancellationToken.ThrowIfCancellationRequested();
770+
764771
List<KeyValuePair<int, TwitchEmote>> tierList = new List<KeyValuePair<int, TwitchEmote>>();
765772
CheerEmote newEmote = new CheerEmote() { prefix = data.prefix, tierList = tierList };
766773
foreach (KeyValuePair<int, EmbedEmoteData> tier in data.tierList)

0 commit comments

Comments
 (0)