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

Cleanup #1280

Merged
merged 5 commits into from
Dec 28, 2024
Merged

Cleanup #1280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2627848
Move FilenameService to TwitchDownloaderCore.Services namespace
ScrubN Dec 28, 2024
7f249dd
Cleanup InfoHandler
ScrubN Dec 28, 2024
c54322b
Use HashCode.Combine
ScrubN Dec 28, 2024
325ce21
Bump SkiaSharp and HarfBuzzSharp to latest minor version
ScrubN Dec 28, 2024
765531c
Use HashSet<> instead of List<>
ScrubN Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions TwitchDownloaderCLI/Modes/DownloadVideo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using TwitchDownloaderCore;
using TwitchDownloaderCore.Interfaces;
using TwitchDownloaderCore.Options;
using TwitchDownloaderCore.Services;
using TwitchDownloaderCore.Tools;

namespace TwitchDownloaderCLI.Modes
Expand Down
4 changes: 2 additions & 2 deletions TwitchDownloaderCLI/Modes/InfoHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
private static void HandleVodRaw(GqlVideoResponse videoInfo, GqlVideoChapterResponse chapters, string playlistString)
{
var stdOut = Console.OpenStandardOutput();
JsonSerializer.Serialize(stdOut, videoInfo);

Check warning on line 102 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 102 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 102 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 102 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 102 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 102 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 102 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.
Console.WriteLine();
JsonSerializer.Serialize(stdOut, chapters);

Check warning on line 104 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 104 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 104 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 104 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 104 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 104 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 104 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.
Console.WriteLine();
Console.Write(playlistString);
}
Expand All @@ -113,7 +113,6 @@

const string DEFAULT_STRING = "-";
var infoVideo = videoInfo.data.video;
var hasBitrate = m3u8.Streams.Any(x => x.StreamInfo.Bandwidth != default);

var infoTableTitle = new TableTitle("Video Info");
var infoTable = new Table()
Expand All @@ -138,6 +137,7 @@
.AddColumn(new TableColumn("FPS").RightAligned())
.AddColumn(new TableColumn("Codecs").RightAligned());

var hasBitrate = m3u8.Streams.Any(x => x.StreamInfo.Bandwidth != default);
if (hasBitrate)
{
streamTable
Expand All @@ -154,7 +154,7 @@

if (hasBitrate)
{
var videoLength = TimeSpan.FromSeconds(videoInfo.data.video.lengthSeconds);
var videoLength = TimeSpan.FromSeconds(infoVideo.lengthSeconds);
var bitrate = stream.StreamInfo.Bandwidth.StringifyOrDefault(x => $"{x / 1000}kbps", DEFAULT_STRING);
var fileSize = stream.StreamInfo.Bandwidth.StringifyOrDefault(x => $"~{VideoSizeEstimator.StringifyByteCount(VideoSizeEstimator.EstimateVideoSize(x, TimeSpan.Zero, videoLength))}", DEFAULT_STRING);
streamTable.AddRow(name, resolution, fps, codecs, bitrate, fileSize);
Expand Down Expand Up @@ -259,9 +259,9 @@
private static void HandleClipRaw(GqlClipResponse clipInfo, GqlClipTokenResponse clipQualities)
{
var stdOut = Console.OpenStandardOutput();
JsonSerializer.Serialize(stdOut, clipInfo);

Check warning on line 262 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 262 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 262 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 262 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 262 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 262 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 262 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.
Console.WriteLine();
JsonSerializer.Serialize(stdOut, clipQualities);

Check warning on line 264 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 264 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 264 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 264 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 264 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 264 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 264 in TwitchDownloaderCLI/Modes/InfoHandler.cs

View workflow job for this annotation

GitHub Actions / build-cli-mac 

Using member 'System.Text.Json.JsonSerializer.Serialize<TValue>(Stream, TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.
}

private static void HandleClipTable(GqlClipResponse clipInfo, GqlClipTokenResponse clipQualities)
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderCLI/Tools/FileCollisionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using TwitchDownloaderCLI.Models;
using TwitchDownloaderCLI.Modes.Arguments;
using TwitchDownloaderCore.Interfaces;
using TwitchDownloaderCore.Tools;
using TwitchDownloaderCore.Services;

namespace TwitchDownloaderCLI.Tools
{
Expand Down
4 changes: 2 additions & 2 deletions ...e.Tests/ToolTests/FilenameServiceTests.cs → ...ests/ServiceTests/FilenameServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using TwitchDownloaderCore.Tools;
using TwitchDownloaderCore.Services;

namespace TwitchDownloaderCore.Tests.ToolTests
namespace TwitchDownloaderCore.Tests.ServiceTests
{
public class FilenameServiceTests
{
Expand Down
3 changes: 2 additions & 1 deletion ...chDownloaderCore/Tools/FilenameService.cs → ...ownloaderCore/Services/FilenameService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
using System.Text;
using System.Text.RegularExpressions;
using TwitchDownloaderCore.Extensions;
using TwitchDownloaderCore.Tools;

namespace TwitchDownloaderCore.Tools
namespace TwitchDownloaderCore.Services
{
public static class FilenameService
{
Expand Down
12 changes: 6 additions & 6 deletions TwitchDownloaderCore/TwitchDownloaderCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="HarfBuzzSharp" Version="7.3.0.2" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
<PackageReference Include="HarfBuzzSharp" Version="7.3.0.3" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.3" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="2.88.8" />
<PackageReference Include="SkiaSharp" Version="2.88.9" />
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.9" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="Unicode.net" Version="2.0.0" />
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions TwitchDownloaderCore/TwitchHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ private static async Task<List<EmoteResponseItem>> GetStvEmotesMetadata(int stre
public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> comments, int streamerId, string cacheFolder, ITaskLogger logger, EmbeddedData embeddedData = null, bool bttv = true, bool ffz = true, bool stv = true, bool allowUnlistedEmotes = true, bool offline = false, CancellationToken cancellationToken = default)
{
List<TwitchEmote> returnList = new List<TwitchEmote>();
List<string> alreadyAdded = new List<string>();
HashSet<string> alreadyAdded = new HashSet<string>();

// No 3rd party emotes are wanted
if (!bttv && !ffz && !stv)
Expand Down Expand Up @@ -459,7 +459,7 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> co
return returnList;

static async Task FetchEmoteImages(IReadOnlyCollection<Comment> comments, IEnumerable<EmoteResponseItem> emoteResponse, ICollection<TwitchEmote> returnList,
ICollection<string> alreadyAdded, DirectoryInfo cacheFolder, ITaskLogger logger, CancellationToken cancellationToken)
ISet<string> alreadyAdded, DirectoryInfo cacheFolder, ITaskLogger logger, CancellationToken cancellationToken)
{
if (!cacheFolder.Exists)
cacheFolder = CreateDirectory(cacheFolder.FullName);
Expand Down Expand Up @@ -500,8 +500,8 @@ where comments.Any(comment => Regex.IsMatch(comment.message.body, pattern))
public static async Task<List<TwitchEmote>> GetEmotes(List<Comment> comments, string cacheFolder, ITaskLogger logger, EmbeddedData embeddedData = null, bool offline = false, CancellationToken cancellationToken = default)
{
List<TwitchEmote> returnList = new List<TwitchEmote>();
List<string> alreadyAdded = new List<string>();
List<string> failedEmotes = new List<string>();
HashSet<string> alreadyAdded = new HashSet<string>();
HashSet<string> failedEmotes = new HashSet<string>();

DirectoryInfo emoteFolder = new DirectoryInfo(Path.Combine(cacheFolder, "emotes"));
if (!emoteFolder.Exists)
Expand Down Expand Up @@ -633,7 +633,7 @@ public static async Task<List<TwitchEmote>> GetEmotes(List<Comment> comments, st
public static async Task<List<ChatBadge>> GetChatBadges(List<Comment> comments, int streamerId, string cacheFolder, ITaskLogger logger, EmbeddedData embeddedData = null, bool offline = false, CancellationToken cancellationToken = default)
{
List<ChatBadge> returnList = new List<ChatBadge>();
List<string> alreadyAdded = new List<string>();
HashSet<string> alreadyAdded = new HashSet<string>();

// Load our embedded data from file
if (embeddedData?.twitchBadges != null)
Expand Down Expand Up @@ -781,7 +781,7 @@ public static async Task<Dictionary<string, SKBitmap>> GetEmojis(string cacheFol
public static async Task<List<CheerEmote>> GetBits(List<Comment> comments, string cacheFolder, string channelId, ITaskLogger logger, EmbeddedData embeddedData = null, bool offline = false, CancellationToken cancellationToken = default)
{
List<CheerEmote> returnList = new List<CheerEmote>();
List<string> alreadyAdded = new List<string>();
HashSet<string> alreadyAdded = new HashSet<string>();

// Load our embedded data from file
if (embeddedData?.twitchBits != null)
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderCore/TwitchObjects/ChatRootInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public override string ToString()
=> $"{Major}.{Minor}.{Patch}";

public override int GetHashCode()
=> ToString().GetHashCode();
=> HashCode.Combine(Major, Minor, Patch);

public static bool operator >(ChatRootVersion left, ChatRootVersion right)
{
Expand Down
1 change: 1 addition & 0 deletions TwitchDownloaderWPF/PageChatDownload.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Windows.Media.Imaging;
using TwitchDownloaderCore;
using TwitchDownloaderCore.Options;
using TwitchDownloaderCore.Services;
using TwitchDownloaderCore.Tools;
using TwitchDownloaderCore.TwitchObjects.Gql;
using TwitchDownloaderWPF.Models;
Expand Down
1 change: 1 addition & 0 deletions TwitchDownloaderWPF/PageChatUpdate.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using TwitchDownloaderCore;
using TwitchDownloaderCore.Chat;
using TwitchDownloaderCore.Options;
using TwitchDownloaderCore.Services;
using TwitchDownloaderCore.Tools;
using TwitchDownloaderCore.TwitchObjects;
using TwitchDownloaderCore.TwitchObjects.Gql;
Expand Down
1 change: 1 addition & 0 deletions TwitchDownloaderWPF/PageClipDownload.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Windows.Media.Imaging;
using TwitchDownloaderCore;
using TwitchDownloaderCore.Options;
using TwitchDownloaderCore.Services;
using TwitchDownloaderCore.Tools;
using TwitchDownloaderCore.TwitchObjects.Gql;
using TwitchDownloaderWPF.Models;
Expand Down
1 change: 1 addition & 0 deletions TwitchDownloaderWPF/PageVodDownload.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using TwitchDownloaderCore;
using TwitchDownloaderCore.Extensions;
using TwitchDownloaderCore.Options;
using TwitchDownloaderCore.Services;
using TwitchDownloaderCore.Tools;
using TwitchDownloaderCore.TwitchObjects.Gql;
using TwitchDownloaderWPF.Models;
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderWPF/Services/FileCollisionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.IO;
using System.Windows;
using Ookii.Dialogs.Wpf;
using TwitchDownloaderCore.Tools;
using TwitchDownloaderCore.Services;
using TwitchDownloaderWPF.Models;
using TwitchDownloaderWPF.Properties;

Expand Down
1 change: 1 addition & 0 deletions TwitchDownloaderWPF/WindowQueueOptions.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Windows.Media;
using TwitchDownloaderCore;
using TwitchDownloaderCore.Options;
using TwitchDownloaderCore.Services;
using TwitchDownloaderCore.Tools;
using TwitchDownloaderWPF.Properties;
using TwitchDownloaderWPF.Services;
Expand Down