Allow selecting 3rd party emotes when enqueuing from VOD/clip pages and task queue (#1540)

Author: ScrubN

TwitchDownloaderWPF/WindowQueueOptions.xaml

@@ -62,7 +62,12 @@
                     <RadioButton x:Name="RadioCompressionNone" IsEnabled="False" IsChecked="True" Content="{lex:Loc ChatCompressionNone}" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
                     <RadioButton x:Name="RadioCompressionGzip" IsEnabled="False" Content="{lex:Loc ChatCompressionGzip}" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
                 </StackPanel>
-                <CheckBox x:Name="checkEmbed" IsEnabled="False" Content="{lex:Loc EmbedImages}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Foreground="{DynamicResource AppText}" BorderBrush="{DynamicResource AppElementBorder}"/>
+                <CheckBox x:Name="checkEmbed" IsEnabled="False" Content="{lex:Loc EmbedImages}" Checked="CheckEmbed_CheckedChanged" Unchecked="CheckEmbed_CheckedChanged" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Foreground="{DynamicResource AppText}" BorderBrush="{DynamicResource AppElementBorder}"/>
+                <StackPanel x:Name="StackThirdPartyEmbed" Margin="5,5,0,0" Orientation="Horizontal">
+                    <CheckBox IsEnabled="False" x:Name="CheckBttvEmbed" Margin="0,0,10,0" Content="BTTV" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                    <CheckBox IsEnabled="False" x:Name="CheckFfzEmbed" Margin="0,0,10,0" Content="FFZ" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                    <CheckBox IsEnabled="False" x:Name="CheckStvEmbed" Margin="0,0,10,0" Content="7TV" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                </StackPanel>
                 <CheckBox x:Name="checkDelayChat" Content="{lex:Loc DelayDownload}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" IsEnabled="False" />
             </StackPanel>
             <CheckBox x:Name="checkRender" IsEnabled="False" Content="{lex:Loc RenderChat}" HorizontalAlignment="Left" Margin="0,8,0,0" VerticalAlignment="Top" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>

TwitchDownloaderWPF/WindowQueueOptions.xaml.cs

@@ -61,6 +61,7 @@ public WindowQueueOptions(Page page)
                 RadioCompressionNone.Visibility = Visibility.Collapsed;
                 RadioCompressionGzip.Visibility = Visibility.Collapsed;
                 checkEmbed.Visibility = Visibility.Collapsed;
+                StackThirdPartyEmbed.Visibility = Visibility.Collapsed;
                 if (!chatPage.radioJson.IsChecked.GetValueOrDefault())
                 {
                     checkRender.IsChecked = false;
@@ -84,6 +85,7 @@ public WindowQueueOptions(Page page)
                 RadioCompressionNone.Visibility = Visibility.Collapsed;
                 RadioCompressionGzip.Visibility = Visibility.Collapsed;
                 checkEmbed.Visibility = Visibility.Collapsed;
+                StackThirdPartyEmbed.Visibility = Visibility.Collapsed;
                 checkDelayChat.Visibility = Visibility.Collapsed;
                 checkRender.Visibility = Visibility.Collapsed;
             }
@@ -100,6 +102,7 @@ public WindowQueueOptions(Page page)
                 RadioCompressionNone.Visibility = Visibility.Collapsed;
                 RadioCompressionGzip.Visibility = Visibility.Collapsed;
                 checkEmbed.Visibility = Visibility.Collapsed;
+                StackThirdPartyEmbed.Visibility = Visibility.Collapsed;
                 checkDelayChat.Visibility = Visibility.Collapsed;
                 checkRender.IsChecked = true;
                 checkRender.IsEnabled = false;
@@ -203,6 +206,9 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                         if (RadioCompressionGzip.IsChecked.GetValueOrDefault() && chatOptions.DownloadFormat == ChatFormat.Json)
                             chatOptions.Compression = ChatCompression.Gzip;
                         chatOptions.EmbedData = checkEmbed.IsChecked.GetValueOrDefault();
+                        chatOptions.BttvEmotes = CheckBttvEmbed.IsChecked.GetValueOrDefault();
+                        chatOptions.FfzEmotes = CheckFfzEmbed.IsChecked.GetValueOrDefault();
+                        chatOptions.StvEmotes = CheckStvEmbed.IsChecked.GetValueOrDefault();
                         chatOptions.DelayDownload = checkDelayChat.IsChecked.GetValueOrDefault();
                         chatOptions.Filename = Path.Combine(folderPath, Path.GetFileNameWithoutExtension(downloadOptions.Filename) + chatOptions.FileExtension);
                         chatOptions.FileCollisionCallback = HandleFileCollisionCallback;
@@ -335,6 +341,9 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                             chatOptions.Compression = ChatCompression.Gzip;
                         chatOptions.TimeFormat = TimestampFormat.Relative;
                         chatOptions.EmbedData = checkEmbed.IsChecked.GetValueOrDefault();
+                        chatOptions.BttvEmotes = CheckBttvEmbed.IsChecked.GetValueOrDefault();
+                        chatOptions.FfzEmotes = CheckFfzEmbed.IsChecked.GetValueOrDefault();
+                        chatOptions.StvEmotes = CheckStvEmbed.IsChecked.GetValueOrDefault();
                         chatOptions.DelayDownload = checkDelayChat.IsChecked.GetValueOrDefault();
                         chatOptions.Filename = Path.Combine(folderPath, FilenameService.GetFilename(Settings.Default.TemplateChat, downloadTask.Info.Title, chatOptions.Id,
                             clipDownloadPage.currentVideoTime, clipDownloadPage.textStreamer.Text, clipDownloadPage.streamerId, TimeSpan.Zero, clipDownloadPage.clipLength, clipDownloadPage.clipLength,
@@ -673,6 +682,9 @@ private void EnqueueDataList()
                     ChatDownloadOptions downloadOptions = new ChatDownloadOptions
                     {
                         EmbedData = checkEmbed.IsChecked.GetValueOrDefault(),
+                        BttvEmotes = CheckBttvEmbed.IsChecked.GetValueOrDefault(),
+                        FfzEmotes = CheckFfzEmbed.IsChecked.GetValueOrDefault(),
+                        StvEmotes = CheckStvEmbed.IsChecked.GetValueOrDefault(),
                         TimeFormat = TimestampFormat.Relative,
                         Id = taskData.Id,
                         TrimBeginning = false,
@@ -770,6 +782,7 @@ private void checkChat_Checked(object sender, RoutedEventArgs e)
             radioTxt.IsEnabled = true;
             radioHTML.IsEnabled = true;
             checkEmbed.IsEnabled = true;
+            CheckBttvEmbed.IsEnabled = CheckFfzEmbed.IsEnabled = CheckStvEmbed.IsEnabled = checkEmbed.IsChecked.GetValueOrDefault();
             checkDelayChat.IsEnabled = true;
             RadioCompressionNone.IsEnabled = true;
             RadioCompressionGzip.IsEnabled = true;
@@ -790,6 +803,7 @@ private void checkChat_Unchecked(object sender, RoutedEventArgs e)
             radioTxt.IsEnabled = false;
             radioHTML.IsEnabled = false;
             checkEmbed.IsEnabled = false;
+            CheckBttvEmbed.IsEnabled = CheckFfzEmbed.IsEnabled = CheckStvEmbed.IsEnabled = false;
             checkDelayChat.IsEnabled = false;
             RadioCompressionNone.IsEnabled = false;
             RadioCompressionGzip.IsEnabled = false;
@@ -807,6 +821,7 @@ private void radioJson_Checked(object sender, RoutedEventArgs e)
             if (this.IsInitialized)
             {
                 checkEmbed.IsEnabled = true;
+                CheckBttvEmbed.IsEnabled = CheckFfzEmbed.IsEnabled = CheckStvEmbed.IsEnabled = checkEmbed.IsChecked.GetValueOrDefault();
                 checkRender.IsEnabled = true;
                 StackChatCompression.Visibility = Visibility.Visible;
             }
@@ -817,6 +832,7 @@ private void radioTxt_Checked(object sender, RoutedEventArgs e)
             if (this.IsInitialized)
             {
                 checkEmbed.IsEnabled = false;
+                CheckBttvEmbed.IsEnabled = CheckFfzEmbed.IsEnabled = CheckStvEmbed.IsEnabled = false;
                 checkRender.IsEnabled = false;
                 StackChatCompression.Visibility = Visibility.Collapsed;
             }
@@ -827,6 +843,7 @@ private void radioHTML_Checked(object sender, RoutedEventArgs e)
             if (this.IsInitialized)
             {
                 checkEmbed.IsEnabled = true;
+                CheckBttvEmbed.IsEnabled = CheckFfzEmbed.IsEnabled = CheckStvEmbed.IsEnabled = checkEmbed.IsChecked.GetValueOrDefault();
                 checkRender.IsEnabled = false;
                 StackChatCompression.Visibility = Visibility.Collapsed;
             }
@@ -862,5 +879,13 @@ private void ComboPreferredQuality_OnSelectionChanged(object sender, SelectionCh
                 Settings.Default.PreferredQuality = preferredQuality;
             }
         }
+
+        private void CheckEmbed_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            CheckBttvEmbed.IsEnabled = CheckFfzEmbed.IsEnabled = CheckStvEmbed.IsEnabled = checkEmbed.IsChecked.GetValueOrDefault();
+        }
     }
 }