Skip to content

Commit

Permalink
Quality of life GUI improvements (#833)
Browse files Browse the repository at this point in the history 
* Use URIs so thumbnails are actually cached for reuse

* Add design time DataContext to PageQueue and WindowMassDownload

* Add loading animation to WindowMassDownload

* Fix wrong border color on bandwidth throttle checkbox

* Combine CheckThrottleEnabled Checked functions

* Tabs -> spaces

* Apparently this wasn't entirely necessary

* Increase code readability

* Use ThumbnailService in WindowUrlList & add more video metadata

* Start cleaning up WindowQueueOptions

* Use Nullable.GetValueOrDefault everywhere & general cleanup

* Refactor WindowQueueOptions to be a little bit easier to follow
  • Loading branch information
@ScrubN
ScrubN authored Sep 30, 2023
1 parent c2eb143 commit 0064ec6
Show file tree
Hide file tree
Showing 15 changed files with 576 additions and 524 deletions.
44 changes: 16 additions & 28 deletions TwitchDownloaderWPF/PageChatDownload.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,14 @@ private async Task GetVideoInfo()
{
GqlVideoResponse videoInfo = await TwitchHelper.GetVideoInfo(int.Parse(downloadId));

try
{
string thumbUrl = videoInfo.data.video.thumbnailURLs.FirstOrDefault();
imgThumbnail.Source = await ThumbnailService.GetThumb(thumbUrl);
}
catch
var thumbUrl = videoInfo.data.video.thumbnailURLs.FirstOrDefault();
if (!ThumbnailService.TryGetThumb(thumbUrl, out var image))
{
AppendLog(Translations.Strings.ErrorLog + Translations.Strings.UnableToFindThumbnail);
var (success, image) = await ThumbnailService.TryGetThumb(ThumbnailService.THUMBNAIL_MISSING_URL);
if (success)
{
imgThumbnail.Source = image;
}
_ = ThumbnailService.TryGetThumb(ThumbnailService.THUMBNAIL_MISSING_URL, out image);
}
imgThumbnail.Source = image;

vodLength = TimeSpan.FromSeconds(videoInfo.data.video.lengthSeconds);
textTitle.Text = videoInfo.data.video.title;
textStreamer.Text = videoInfo.data.video.owner.displayName;
Expand Down Expand Up @@ -169,20 +163,14 @@ private async Task GetVideoInfo()
string clipId = downloadId;
GqlClipResponse clipInfo = await TwitchHelper.GetClipInfo(clipId);

try
{
string thumbUrl = clipInfo.data.clip.thumbnailURL;
imgThumbnail.Source = await ThumbnailService.GetThumb(thumbUrl);
}
catch
var thumbUrl = clipInfo.data.clip.thumbnailURL;
if (!ThumbnailService.TryGetThumb(thumbUrl, out var image))
{
AppendLog(Translations.Strings.ErrorLog + Translations.Strings.UnableToFindThumbnail);
var (success, image) = await ThumbnailService.TryGetThumb(ThumbnailService.THUMBNAIL_MISSING_URL);
if (success)
{
imgThumbnail.Source = image;
}
_ = ThumbnailService.TryGetThumb(ThumbnailService.THUMBNAIL_MISSING_URL, out image);
}
imgThumbnail.Source = image;

TimeSpan clipLength = TimeSpan.FromSeconds(clipInfo.data.clip.durationSeconds);
textStreamer.Text = clipInfo.data.clip.broadcaster.displayName;
var clipCreatedAt = clipInfo.data.clip.createdAt;
Expand Down Expand Up @@ -253,10 +241,10 @@ public ChatDownloadOptions GetOptions(string filename)
else if (radioCompressionGzip.IsChecked == true)
options.Compression = ChatCompression.Gzip;

options.EmbedData = (bool)checkEmbed.IsChecked;
options.BttvEmotes = (bool)checkBttvEmbed.IsChecked;
options.FfzEmotes = (bool)checkFfzEmbed.IsChecked;
options.StvEmotes = (bool)checkStvEmbed.IsChecked;
options.EmbedData = checkEmbed.IsChecked.GetValueOrDefault();
options.BttvEmotes = checkBttvEmbed.IsChecked.GetValueOrDefault();
options.FfzEmotes = checkFfzEmbed.IsChecked.GetValueOrDefault();
options.StvEmotes = checkStvEmbed.IsChecked.GetValueOrDefault();
options.Filename = filename;
options.ConnectionCount = (int)numChatDownloadConnections.Value;
return options;
Expand Down Expand Up @@ -573,12 +561,12 @@ private void BtnCancel_Click(object sender, RoutedEventArgs e)

private void checkCropStart_OnCheckStateChanged(object sender, RoutedEventArgs e)
{
SetEnabledCropStart((bool)checkCropStart.IsChecked);
SetEnabledCropStart(checkCropStart.IsChecked.GetValueOrDefault());
}

private void checkCropEnd_OnCheckStateChanged(object sender, RoutedEventArgs e)
{
SetEnabledCropEnd((bool)checkCropEnd.IsChecked);
SetEnabledCropEnd(checkCropEnd.IsChecked.GetValueOrDefault());
}


Expand Down
98 changes: 49 additions & 49 deletions TwitchDownloaderWPF/PageChatRender.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ public ChatRenderOptions GetOptions(string filename)
InputFile = textJson.Text,
BackgroundColor = backgroundColor,
AlternateBackgroundColor = altBackgroundColor,
AlternateMessageBackgrounds = (bool)checkAlternateMessageBackgrounds.IsChecked,
AlternateMessageBackgrounds = checkAlternateMessageBackgrounds.IsChecked.GetValueOrDefault(),
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,
BttvEmotes = checkBTTV.IsChecked.GetValueOrDefault(),
FfzEmotes = checkFFZ.IsChecked.GetValueOrDefault(),
StvEmotes = checkSTV.IsChecked.GetValueOrDefault(),
Outline = checkOutline.IsChecked.GetValueOrDefault(),
Font = (string)comboFont.SelectedItem,
FontSize = numFontSize.Value,
UpdateRate = double.Parse(textUpdateTime.Text, CultureInfo.CurrentCulture),
Expand All @@ -118,22 +118,22 @@ public ChatRenderOptions GetOptions(string filename)
VerticalSpacingScale = double.Parse(textVerticalScale.Text, CultureInfo.CurrentCulture),
IgnoreUsersArray = textIgnoreUsersList.Text.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
BannedWordsArray = textBannedWordsList.Text.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
Timestamp = (bool)checkTimestamp.IsChecked,
Timestamp = checkTimestamp.IsChecked.GetValueOrDefault(),
MessageColor = messageColor,
Framerate = int.Parse(textFramerate.Text),
InputArgs = CheckRenderSharpening.IsChecked == true ? textFfmpegInput.Text + " -filter_complex \"smartblur=lr=1:ls=-1.0\"" : textFfmpegInput.Text,
OutputArgs = textFfmpegOutput.Text,
MessageFontStyle = SKFontStyle.Normal,
UsernameFontStyle = SKFontStyle.Bold,
GenerateMask = (bool)checkMask.IsChecked,
GenerateMask = checkMask.IsChecked.GetValueOrDefault(),
OutlineSize = 4 * double.Parse(textOutlineScale.Text, CultureInfo.CurrentCulture),
FfmpegPath = "ffmpeg",
TempFolder = Settings.Default.TempPath,
SubMessages = (bool)checkSub.IsChecked,
ChatBadges = (bool)checkBadge.IsChecked,
Offline = (bool)checkOffline.IsChecked,
SubMessages = checkSub.IsChecked.GetValueOrDefault(),
ChatBadges = checkBadge.IsChecked.GetValueOrDefault(),
Offline = checkOffline.IsChecked.GetValueOrDefault(),
AllowUnlistedEmotes = true,
DisperseCommentOffsets = (bool)checkDispersion.IsChecked,
DisperseCommentOffsets = checkDispersion.IsChecked.GetValueOrDefault(),
LogFfmpegOutput = true
};
if (RadioEmojiNotoColor.IsChecked == true)
Expand Down Expand Up @@ -287,29 +287,29 @@ private void ComboFormatOnSelectionChanged(object sender, SelectionChangedEventA
public void SaveSettings()
{
Settings.Default.Font = comboFont.SelectedItem.ToString();
Settings.Default.Outline = (bool)checkOutline.IsChecked;
Settings.Default.Timestamp = (bool)checkTimestamp.IsChecked;
Settings.Default.BackgroundColorR = colorBackground.SelectedColor.Value.R;
Settings.Default.BackgroundColorG = colorBackground.SelectedColor.Value.G;
Settings.Default.BackgroundColorB = colorBackground.SelectedColor.Value.B;
Settings.Default.BackgroundColorA = colorBackground.SelectedColor.Value.A;
Settings.Default.AlternateBackgroundColorR = colorAlternateBackground.SelectedColor.Value.R;
Settings.Default.AlternateBackgroundColorG = colorAlternateBackground.SelectedColor.Value.G;
Settings.Default.AlternateBackgroundColorB = colorAlternateBackground.SelectedColor.Value.B;
Settings.Default.AlternateBackgroundColorA = colorAlternateBackground.SelectedColor.Value.A;
Settings.Default.FFZEmotes = (bool)checkFFZ.IsChecked;
Settings.Default.BTTVEmotes = (bool)checkBTTV.IsChecked;
Settings.Default.STVEmotes = (bool)checkSTV.IsChecked;
Settings.Default.FontColorR = colorFont.SelectedColor.Value.R;
Settings.Default.FontColorG = colorFont.SelectedColor.Value.G;
Settings.Default.FontColorB = colorFont.SelectedColor.Value.B;
Settings.Default.GenerateMask = (bool)checkMask.IsChecked;
Settings.Default.ChatRenderSharpening = (bool)CheckRenderSharpening.IsChecked;
Settings.Default.SubMessages = (bool)checkSub.IsChecked;
Settings.Default.ChatBadges = (bool)checkBadge.IsChecked;
Settings.Default.Offline = (bool)checkOffline.IsChecked;
Settings.Default.DisperseCommentOffsets = (bool)checkDispersion.IsChecked;
Settings.Default.AlternateMessageBackgrounds = (bool)checkAlternateMessageBackgrounds.IsChecked;
Settings.Default.Outline = checkOutline.IsChecked.GetValueOrDefault();
Settings.Default.Timestamp = checkTimestamp.IsChecked.GetValueOrDefault();
Settings.Default.BackgroundColorR = colorBackground.SelectedColor.GetValueOrDefault().R;
Settings.Default.BackgroundColorG = colorBackground.SelectedColor.GetValueOrDefault().G;
Settings.Default.BackgroundColorB = colorBackground.SelectedColor.GetValueOrDefault().B;
Settings.Default.BackgroundColorA = colorBackground.SelectedColor.GetValueOrDefault().A;
Settings.Default.AlternateBackgroundColorR = colorAlternateBackground.SelectedColor.GetValueOrDefault().R;
Settings.Default.AlternateBackgroundColorG = colorAlternateBackground.SelectedColor.GetValueOrDefault().G;
Settings.Default.AlternateBackgroundColorB = colorAlternateBackground.SelectedColor.GetValueOrDefault().B;
Settings.Default.AlternateBackgroundColorA = colorAlternateBackground.SelectedColor.GetValueOrDefault().A;
Settings.Default.FFZEmotes = checkFFZ.IsChecked.GetValueOrDefault();
Settings.Default.BTTVEmotes = checkBTTV.IsChecked.GetValueOrDefault();
Settings.Default.STVEmotes = checkSTV.IsChecked.GetValueOrDefault();
Settings.Default.FontColorR = colorFont.SelectedColor.GetValueOrDefault().R;
Settings.Default.FontColorG = colorFont.SelectedColor.GetValueOrDefault().G;
Settings.Default.FontColorB = colorFont.SelectedColor.GetValueOrDefault().B;
Settings.Default.GenerateMask = checkMask.IsChecked.GetValueOrDefault();
Settings.Default.ChatRenderSharpening = CheckRenderSharpening.IsChecked.GetValueOrDefault();
Settings.Default.SubMessages = checkSub.IsChecked.GetValueOrDefault();
Settings.Default.ChatBadges = checkBadge.IsChecked.GetValueOrDefault();
Settings.Default.Offline = checkOffline.IsChecked.GetValueOrDefault();
Settings.Default.DisperseCommentOffsets = checkDispersion.IsChecked.GetValueOrDefault();
Settings.Default.AlternateMessageBackgrounds = checkAlternateMessageBackgrounds.IsChecked.GetValueOrDefault();
if (comboFormat.SelectedItem != null)
{
Settings.Default.VideoContainer = ((VideoContainer)comboFormat.SelectedItem).Name;
Expand Down Expand Up @@ -376,21 +376,21 @@ private bool ValidateInputs()

try
{
int.Parse(textHeight.Text);
int.Parse(textWidth.Text);
double.Parse(textUpdateTime.Text, CultureInfo.CurrentCulture);
int.Parse(textFramerate.Text);
double.Parse(textEmoteScale.Text, CultureInfo.CurrentCulture);
double.Parse(textBadgeScale.Text, CultureInfo.CurrentCulture);
double.Parse(textEmojiScale.Text, CultureInfo.CurrentCulture);
double.Parse(textVerticalScale.Text, CultureInfo.CurrentCulture);
double.Parse(textSidePaddingScale.Text, CultureInfo.CurrentCulture);
double.Parse(textSectionHeightScale.Text, CultureInfo.CurrentCulture);
double.Parse(textWordSpaceScale.Text, CultureInfo.CurrentCulture);
double.Parse(textEmoteSpaceScale.Text, CultureInfo.CurrentCulture);
double.Parse(textAccentStrokeScale.Text, CultureInfo.CurrentCulture);
double.Parse(textAccentIndentScale.Text, CultureInfo.CurrentCulture);
double.Parse(textOutlineScale.Text, CultureInfo.CurrentCulture);
_ = int.Parse(textHeight.Text);
_ = int.Parse(textWidth.Text);
_ = double.Parse(textUpdateTime.Text, CultureInfo.CurrentCulture);
_ = int.Parse(textFramerate.Text);
_ = double.Parse(textEmoteScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textBadgeScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textEmojiScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textVerticalScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textSidePaddingScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textSectionHeightScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textWordSpaceScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textEmoteSpaceScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textAccentStrokeScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textAccentIndentScale.Text, CultureInfo.CurrentCulture);
_ = double.Parse(textOutlineScale.Text, CultureInfo.CurrentCulture);
}
catch (Exception ex)
{
Expand Down
Loading

0 comments on commit 0064ec6

Please sign in to comment.