Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #388 - Fixed locale causing imporper double parsing #420

Merged
merged 7 commits into from
Nov 12, 2022
Merged

Fix #388 - Fixed locale causing imporper double parsing #420

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce08eb8
Fix #388 - Fixed locale causing imporper double parsing
ScrubN Nov 8, 2022
2997463
Merge branch 'master' into gui-chatrender-patch
ScrubN Nov 8, 2022
fbbb8d5
Use culture info instead of string.Replace
ScrubN Nov 8, 2022
73bcd2a
Merge branch 'gui-chatrender-patch' of https://github.com/ScrubN/Twit…
ScrubN Nov 8, 2022
5c316ad
Use culture info instead of string.Replace
ScrubN Nov 8, 2022
26bf064
fixed merge issue
ScrubN Nov 8, 2022
3e40acb
Fixed accidental merge issue
ScrubN Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
125 changes: 72 additions & 53 deletions TwitchDownloaderWPF/PageChatRender.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Threading;
Expand All @@ -30,7 +31,7 @@ namespace TwitchDownloaderWPF
/// <summary>
/// Interaction logic for PageChatRender.xaml
/// </summary>
public partial class PageChatRender : System.Windows.Controls.Page
public partial class PageChatRender : Page
{
public SKPaint imagePaint = new SKPaint() { IsAntialias = true, FilterQuality = SKFilterQuality.High };
public SKPaint emotePaint = new SKPaint() { IsAntialias = true, FilterQuality = SKFilterQuality.High };
Expand All @@ -55,39 +56,38 @@ private void btnBrowse_Click(object sender, RoutedEventArgs e)

public ChatRenderOptions GetOptions(string filename)
{
ChatRenderOptions options = new ChatRenderOptions();
SKColor backgroundColor = new SKColor(colorBackground.SelectedColor.Value.R, colorBackground.SelectedColor.Value.G, colorBackground.SelectedColor.Value.B, colorBackground.SelectedColor.Value.A);
SKColor messageColor = new SKColor(colorFont.SelectedColor.Value.R, colorFont.SelectedColor.Value.G, colorFont.SelectedColor.Value.B);
options.OutputFile = filename;
options.InputFile = textJson.Text;
options.BackgroundColor = backgroundColor;
options.ChatHeight = Int32.Parse(textHeight.Text);
options.ChatWidth = Int32.Parse(textWidth.Text);
options.BttvEmotes = (bool)checkBTTV.IsChecked;
options.FfzEmotes = (bool)checkFFZ.IsChecked;
options.StvEmotes = (bool)checkSTV.IsChecked;
options.Outline = (bool)checkOutline.IsChecked;
options.Font = (string)comboFont.SelectedItem;
options.FontSize = numFontSize.Value;
options.UpdateRate = Double.Parse(textUpdateTime.Text);
options.EmoteScale = Double.Parse(textEmoteScale.Text);
options.IgnoreUsersList = textIgnoreUsersList.Text
.ToLower()
.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
.ToList();
options.Timestamp = (bool)checkTimestamp.IsChecked;
options.MessageColor = messageColor;
options.Framerate = Int32.Parse(textFramerate.Text);
options.InputArgs = textFfmpegInput.Text;
options.OutputArgs = textFfmpegOutput.Text;
options.MessageFontStyle = SKFontStyle.Normal;
options.UsernameFontStyle = SKFontStyle.Bold;
options.GenerateMask = (bool)checkMask.IsChecked;
options.OutlineSize = 4;
options.FfmpegPath = "ffmpeg";
options.TempFolder = Settings.Default.TempPath;
options.SubMessages = (bool)checkSub.IsChecked;
options.ChatBadges = (bool)checkBadge.IsChecked;
SKColor backgroundColor = new(colorBackground.SelectedColor.Value.R, colorBackground.SelectedColor.Value.G, colorBackground.SelectedColor.Value.B, colorBackground.SelectedColor.Value.A);
SKColor messageColor = new(colorFont.SelectedColor.Value.R, colorFont.SelectedColor.Value.G, colorFont.SelectedColor.Value.B);
ChatRenderOptions options = new()
{
OutputFile = filename,
InputFile = textJson.Text,
BackgroundColor = backgroundColor,
ChatHeight = int.Parse(textHeight.Text),
ChatWidth = int.Parse(textWidth.Text),
BttvEmotes = (bool)checkBTTV.IsChecked,
FfzEmotes = (bool)checkFFZ.IsChecked,
StvEmotes = (bool)checkSTV.IsChecked,
Outline = (bool)checkOutline.IsChecked,
Font = (string)comboFont.SelectedItem,
FontSize = numFontSize.Value,
UpdateRate = double.Parse(textUpdateTime.Text, CultureInfo.CurrentCulture),
EmoteScale = double.Parse(textEmoteScale.Text, CultureInfo.CurrentCulture),
IgnoreUsersList = textIgnoreUsersList.Text.ToLower().Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToList(),
Timestamp = (bool)checkTimestamp.IsChecked,
MessageColor = messageColor,
Framerate = int.Parse(textFramerate.Text),
InputArgs = textFfmpegInput.Text,
OutputArgs = textFfmpegOutput.Text,
MessageFontStyle = SKFontStyle.Normal,
UsernameFontStyle = SKFontStyle.Bold,
GenerateMask = (bool)checkMask.IsChecked,
OutlineSize = 4,
FfmpegPath = "ffmpeg",
TempFolder = Settings.Default.TempPath,
SubMessages = (bool)checkSub.IsChecked,
ChatBadges = (bool)checkBadge.IsChecked
};
foreach (var item in comboBadges.SelectedItems)
{
options.ChatBadgeMask += (int)((ChatBadgeListItem)item).Type;
Expand All @@ -99,11 +99,17 @@ public ChatRenderOptions GetOptions(string filename)
private void OnProgressChanged(ProgressReport progress)
{
if (progress.reportType == ReportType.Percent)
{
statusProgressBar.Value = (int)progress.data;
if (progress.reportType == ReportType.Message || progress.reportType == ReportType.MessageInfo)
}
if (progress.reportType is ReportType.Message or ReportType.MessageInfo)
{
statusMessage.Text = (string)progress.data;
}
if (progress.reportType == ReportType.Log)
{
AppendLog((string)progress.data);
}
}

private void LoadSettings()
Expand Down Expand Up @@ -134,11 +140,11 @@ private void LoadSettings()
comboBadges.Items.Add(new ChatBadgeListItem() { Type = ChatBadgeType.VIP, Name = "VIPs" });
comboBadges.Items.Add(new ChatBadgeListItem() { Type = ChatBadgeType.Subscriber, Name = "Subs" });
comboBadges.Items.Add(new ChatBadgeListItem() { Type = ChatBadgeType.Predictions, Name = "Predictions" });
comboBadges.Items.Add(new ChatBadgeListItem() { Type = ChatBadgeType.NoAudioVisual, Name = "No Audio/Visual" });
comboBadges.Items.Add(new ChatBadgeListItem() { Type = ChatBadgeType.NoAudioVisual, Name = "No Audio/No Video" });
comboBadges.Items.Add(new ChatBadgeListItem() { Type = ChatBadgeType.PrimeGaming, Name = "Prime" });
comboBadges.Items.Add(new ChatBadgeListItem() { Type = ChatBadgeType.Other, Name = "Others" });

foreach(ChatBadgeListItem item in comboBadges.Items)
foreach (ChatBadgeListItem item in comboBadges.Items)
{
if (((ChatBadgeType)Settings.Default.ChatBadgeMask).HasFlag(item.Type))
comboBadges.SelectedItems.Add(item);
Expand All @@ -153,7 +159,9 @@ private void LoadSettings()
{
comboCodec.Items.Add(codec);
if (codec.Name == Settings.Default.VideoCodec)
{
comboCodec.SelectedItem = codec;
}
}
break;
}
Expand Down Expand Up @@ -189,11 +197,15 @@ private void ComboFormatOnSelectionChanged(object sender, SelectionChangedEventA
{
comboCodec.Items.Add(codec);
if (Settings.Default.VideoCodec == codec.Name)
{
comboCodec.SelectedItem = Settings.Default.VideoCodec;
}
}

if (comboCodec.SelectedItem == null)
{
comboCodec.SelectedIndex = 0;
}
}

public void SaveSettings()
Expand All @@ -215,26 +227,30 @@ public void SaveSettings()
Settings.Default.SubMessages = (bool)checkSub.IsChecked;
Settings.Default.ChatBadges = (bool)checkBadge.IsChecked;
if (comboFormat.SelectedItem != null)
{
Settings.Default.VideoContainer = ((VideoContainer)comboFormat.SelectedItem).Name;
}
if (comboCodec.SelectedItem != null)
{
Settings.Default.VideoCodec = ((Codec)comboCodec.SelectedItem).Name;
Settings.Default.IgnoreUsersList = String.Join(",",textIgnoreUsersList.Text
.ToLower()
}
Settings.Default.IgnoreUsersList = string.Join(",", textIgnoreUsersList.Text.ToLower()
.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries));
int newMask = 0;
foreach (var item in comboBadges.SelectedItems)
{
newMask += (int)((ChatBadgeListItem)item).Type;
}
Settings.Default.ChatBadgeMask = newMask;

try
{
Settings.Default.Height = Int32.Parse(textHeight.Text);
Settings.Default.Width = Int32.Parse(textWidth.Text);
Settings.Default.Height = int.Parse(textHeight.Text);
Settings.Default.Width = int.Parse(textWidth.Text);
Settings.Default.FontSize = (float)numFontSize.Value;
Settings.Default.UpdateTime = float.Parse(textUpdateTime.Text);
Settings.Default.Framerate = Int32.Parse(textFramerate.Text);
Settings.Default.EmoteScale = float.Parse(textEmoteScale.Text);
Settings.Default.UpdateTime = double.Parse(textUpdateTime.Text, CultureInfo.CurrentCulture);
Settings.Default.Framerate = int.Parse(textFramerate.Text);
Settings.Default.EmoteScale = double.Parse(textEmoteScale.Text, CultureInfo.CurrentCulture);
}
catch { }
Settings.Default.Save();
Expand All @@ -250,11 +266,11 @@ private bool ValidateInputs()

try
{
Int32.Parse(textHeight.Text);
Int32.Parse(textWidth.Text);
Double.Parse(textUpdateTime.Text);
Int32.Parse(textFramerate.Text);
Double.Parse(textEmoteScale.Text);
int.Parse(textHeight.Text);
int.Parse(textWidth.Text);
double.Parse(textUpdateTime.Text, CultureInfo.CurrentCulture);
int.Parse(textFramerate.Text);
double.Parse(textEmoteScale.Text, CultureInfo.CurrentCulture);
}
catch (Exception ex)
{
Expand All @@ -264,7 +280,8 @@ private bool ValidateInputs()

if (colorBackground.SelectedColor.Value.A < 255)
{
if ((((VideoContainer)comboFormat.SelectedItem).Name == "MOV" && ( ((Codec)comboCodec.SelectedItem).Name == "RLE") || ((Codec)comboCodec.SelectedItem).Name == "ProRes") || ((VideoContainer)comboFormat.SelectedItem).Name == "WEBM" || (bool)checkMask.IsChecked)
if (((VideoContainer)comboFormat.SelectedItem).Name == "MOV" && ((Codec)comboCodec.SelectedItem).Name == "RLE" ||
((Codec)comboCodec.SelectedItem).Name == "ProRes" || ((VideoContainer)comboFormat.SelectedItem).Name == "WEBM" || (bool)checkMask.IsChecked)
{
return true;
}
Expand All @@ -276,7 +293,7 @@ private bool ValidateInputs()
}
}

if (Int32.Parse(textHeight.Text) % 2 != 0 || Int32.Parse(textWidth.Text) % 2 != 0)
if (int.Parse(textHeight.Text) % 2 != 0 || int.Parse(textWidth.Text) % 2 != 0)
{
AppendLog("ERROR: Height and Width must be even");
return false;
Expand All @@ -287,9 +304,9 @@ private bool ValidateInputs()

private void AppendLog(string message)
{
textLog.Dispatcher.BeginInvoke((Action)(() =>
textLog.Dispatcher.BeginInvoke(() =>
textLog.AppendText(message + Environment.NewLine)
));
);
}

public void SetImage(string imageUri, bool isGif)
Expand All @@ -299,7 +316,9 @@ public void SetImage(string imageUri, bool isGif)
image.UriSource = new Uri(imageUri, UriKind.Relative);
image.EndInit();
if (isGif)
{
ImageBehavior.SetAnimatedSource(statusImage, image);
}
else
{
ImageBehavior.SetAnimatedSource(statusImage, null);
Expand Down