Cleanup (#1280)

* Move FilenameService to TwitchDownloaderCore.Services namespace

* Cleanup InfoHandler

* Use HashCode.Combine

* Bump SkiaSharp and HarfBuzzSharp to latest minor version

* Use HashSet<> instead of List<>

TwitchDownloaderCLI/Modes/DownloadVideo.cs

@@ -7,6 +7,7 @@
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Interfaces;
 using TwitchDownloaderCore.Options;
+using TwitchDownloaderCore.Services;
 using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCLI.Modes

TwitchDownloaderCLI/Modes/InfoHandler.cs

@@ -113,7 +113,6 @@ private static void HandleVodTable(GqlVideoResponse videoInfo, GqlVideoChapterRe
 
             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()
@@ -138,6 +137,7 @@ private static void HandleVodTable(GqlVideoResponse videoInfo, GqlVideoChapterRe
                 .AddColumn(new TableColumn("FPS").RightAligned())
                 .AddColumn(new TableColumn("Codecs").RightAligned());
 
+            var hasBitrate = m3u8.Streams.Any(x => x.StreamInfo.Bandwidth != default);
             if (hasBitrate)
             {
                 streamTable
@@ -154,7 +154,7 @@ private static void HandleVodTable(GqlVideoResponse videoInfo, GqlVideoChapterRe
 
                 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);

TwitchDownloaderCLI/Tools/FileCollisionHandler.cs

@@ -3,7 +3,7 @@
 using TwitchDownloaderCLI.Models;
 using TwitchDownloaderCLI.Modes.Arguments;
 using TwitchDownloaderCore.Interfaces;
-using TwitchDownloaderCore.Tools;
+using TwitchDownloaderCore.Services;
 
 namespace TwitchDownloaderCLI.Tools
 {

TwitchDownloaderCore.Tests/ToolTests/FilenameServiceTests.cs → TwitchDownloaderCore.Tests/ServiceTests/FilenameServiceTests.cs

@@ -1,6 +1,6 @@
-using TwitchDownloaderCore.Tools;
+using TwitchDownloaderCore.Services;
 
-namespace TwitchDownloaderCore.Tests.ToolTests
+namespace TwitchDownloaderCore.Tests.ServiceTests
 {
     public class FilenameServiceTests
     {

TwitchDownloaderCore/Tools/FilenameService.cs → TwitchDownloaderCore/Services/FilenameService.cs

@@ -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
     {

TwitchDownloaderCore/TwitchDownloaderCore.csproj

@@ -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>

TwitchDownloaderCore/TwitchHelper.cs

@@ -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)
@@ -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);
@@ -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)
@@ -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)
@@ -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)

TwitchDownloaderCore/TwitchObjects/ChatRootInfo.cs

@@ -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)
         {

TwitchDownloaderWPF/PageChatDownload.xaml.cs

@@ -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;

TwitchDownloaderWPF/PageChatUpdate.xaml.cs

@@ -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;

TwitchDownloaderWPF/PageClipDownload.xaml.cs

@@ -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;

TwitchDownloaderWPF/PageVodDownload.xaml.cs

@@ -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;

TwitchDownloaderWPF/Services/FileCollisionService.cs

@@ -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;
 

TwitchDownloaderWPF/WindowQueueOptions.xaml.cs

@@ -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;