Kick support

TwitchDownloaderCLI/Modes/Arguments/ClipDownloadArgs.cs

@@ -23,6 +23,8 @@ public class ClipDownloadArgs : ITwitchDownloaderArgs
 
         [Option("ffmpeg-path", HelpText = "Path to FFmpeg executable.")]
         public string FfmpegPath { get; set; }
+        [Option("curl-path", HelpText = "Path to curl-impersonate executable.")]
+        public string CurlImpersonatePath { get; set; }
 
         [Option("temp-path", Default = "", HelpText = "Path to temporary caching folder.")]
         public string TempFolder { get; set; }

TwitchDownloaderCLI/Modes/Arguments/CurlArgs.cs

@@ -0,0 +1,21 @@
+using CommandLine.Text;
+using CommandLine;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TwitchDownloaderCLI.Modes.Arguments
+{
+    [Verb("curl", HelpText = "Manage standalone curl-impersonate")]
+    public class CurlArgs : ITwitchDownloaderArgs
+    {
+        [Option('d', "download", Default = false, Required = false, HelpText = "Downloads curl-impersonate as a standalone file.")]
+        public bool DownloadCurl { get; set; }
+
+        [Option("banner", Default = true, HelpText = "Displays a banner containing version and copyright information.")]
+        public bool? ShowBanner { get; set; }
+    }
+}

TwitchDownloaderCLI/Modes/DownloadChat.cs

@@ -7,6 +7,8 @@
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Chat;
 using TwitchDownloaderCore.Options;
+using TwitchDownloaderCore.VideoPlatforms.Interfaces;
+using TwitchDownloaderCore.VideoPlatforms.Twitch.Downloaders;
 
 namespace TwitchDownloaderCLI.Modes
 {
@@ -16,10 +18,10 @@ internal static void Download(ChatDownloadArgs inputOptions)
         {
             var downloadOptions = GetDownloadOptions(inputOptions);
 
-            ChatDownloader chatDownloader = new(downloadOptions);
             Progress<ProgressReport> progress = new();
-            progress.ProgressChanged += ProgressHandler.Progress_ProgressChanged;
-            chatDownloader.DownloadAsync(progress, new CancellationToken()).Wait();
+            ChatDownloaderFactory downloadFactory = new ChatDownloaderFactory(progress);
+            IChatDownloader chatDownloader = downloadFactory.Create(downloadOptions);
+            chatDownloader.DownloadAsync(new CancellationToken()).Wait();
         }
 
         private static ChatDownloadOptions GetDownloadOptions(ChatDownloadArgs inputOptions)

TwitchDownloaderCLI/Modes/DownloadClip.cs

@@ -6,6 +6,8 @@
 using TwitchDownloaderCLI.Tools;
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Options;
+using TwitchDownloaderCore.Tools;
+using TwitchDownloaderCore.VideoPlatforms.Interfaces;
 
 namespace TwitchDownloaderCLI.Modes
 {
@@ -23,7 +25,8 @@ internal static void Download(ClipDownloadArgs inputOptions)
 
             var downloadOptions = GetDownloadOptions(inputOptions);
 
-            ClipDownloader clipDownloader = new(downloadOptions, progress);
+            ClipDownloaderFactory downloadFactory = new ClipDownloaderFactory(progress);
+            IClipDownloader clipDownloader = downloadFactory.Create(downloadOptions);
             clipDownloader.DownloadAsync(new CancellationToken()).Wait();
         }
 
@@ -35,23 +38,28 @@ private static ClipDownloadOptions GetDownloadOptions(ClipDownloadArgs inputOpti
                 Environment.Exit(1);
             }
 
-            var clipIdRegex = new Regex(@"(?<=^|(?:clips\.)?twitch\.tv\/(?:\S+\/clip)?\/?)[\w-]+?(?=$|\?)");
-            var clipIdMatch = clipIdRegex.Match(inputOptions.Id);
-            if (!clipIdMatch.Success)
+            bool success = UrlParse.TryParseClip(inputOptions.Id, out VideoPlatform videoPlatform, out string videoId);
+            if (!success)
             {
                 Console.WriteLine("[ERROR] - Unable to parse Clip ID/URL.");
                 Environment.Exit(1);
             }
 
+            if (videoPlatform == VideoPlatform.Kick)
+            {
+                CurlHandler.DetectCurl(inputOptions.CurlImpersonatePath);
+            }
+
             ClipDownloadOptions downloadOptions = new()
             {
-                Id = clipIdMatch.Value,
+                Id = videoId,
                 Filename = inputOptions.OutputFile,
                 Quality = inputOptions.Quality,
                 ThrottleKib = inputOptions.ThrottleKib,
                 FfmpegPath = string.IsNullOrWhiteSpace(inputOptions.FfmpegPath) ? FfmpegHandler.FfmpegExecutableName : Path.GetFullPath(inputOptions.FfmpegPath),
                 EncodeMetadata = inputOptions.EncodeMetadata!.Value,
-                TempFolder = inputOptions.TempFolder
+                TempFolder = inputOptions.TempFolder,
+                VideoPlatform = videoPlatform,
             };
 
             return downloadOptions;

TwitchDownloaderCLI/Modes/DownloadVideo.cs

@@ -6,6 +6,8 @@
 using TwitchDownloaderCLI.Tools;
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Options;
+using TwitchDownloaderCore.VideoPlatforms.Interfaces;
+using TwitchDownloaderCore.VideoPlatforms.Twitch.Downloaders;
 
 namespace TwitchDownloaderCLI.Modes
 {
@@ -19,7 +21,8 @@ internal static void Download(VideoDownloadArgs inputOptions)
             progress.ProgressChanged += ProgressHandler.Progress_ProgressChanged;
 
             var downloadOptions = GetDownloadOptions(inputOptions);
-            VideoDownloader videoDownloader = new(downloadOptions, progress);
+            VideoDownloaderFactory downloadFactory = new VideoDownloaderFactory(progress);
+            IVideoDownloader videoDownloader = downloadFactory.Create(downloadOptions);
             videoDownloader.DownloadAsync(new CancellationToken()).Wait();
         }
 
@@ -43,7 +46,7 @@ private static VideoDownloadOptions GetDownloadOptions(VideoDownloadArgs inputOp
             {
                 DownloadThreads = inputOptions.DownloadThreads,
                 ThrottleKib = inputOptions.ThrottleKib,
-                Id = int.Parse(vodIdMatch.ValueSpan),
+                Id = vodIdMatch.ValueSpan.ToString(),
                 Oauth = inputOptions.Oauth,
                 Filename = inputOptions.OutputFile,
                 Quality = inputOptions.Quality,

TwitchDownloaderCLI/Program.cs

@@ -18,6 +18,7 @@ private static void Main(string[] args)
         {
             // Set the working dir to the app dir in case we inherited a different working dir
             Directory.SetCurrentDirectory(AppContext.BaseDirectory);
+            Environment.SetEnvironmentVariable("CURL_IMPERSONATE", "chrome110");
 
             var preParsedArgs = PreParseArgs.Parse(args, Path.GetFileName(Environment.ProcessPath));
 
@@ -27,7 +28,7 @@ private static void Main(string[] args)
                 config.HelpWriter = TextWriter.Null;
             });
 
-            var parserResult = parser.ParseArguments<VideoDownloadArgs, ClipDownloadArgs, ChatDownloadArgs, ChatUpdateArgs, ChatRenderArgs, FfmpegArgs, CacheArgs>(preParsedArgs);
+            var parserResult = parser.ParseArguments<VideoDownloadArgs, ClipDownloadArgs, ChatDownloadArgs, ChatUpdateArgs, ChatRenderArgs, FfmpegArgs, CurlArgs, CacheArgs>(preParsedArgs);
             parserResult.WithNotParsed(errors => WriteHelpText(errors, parserResult, parser.Settings));
 
             CoreLicensor.EnsureFilesExist(AppContext.BaseDirectory);
@@ -40,6 +41,7 @@ private static void Main(string[] args)
                 .WithParsed<ChatUpdateArgs>(UpdateChat.Update)
                 .WithParsed<ChatRenderArgs>(RenderChat.Render)
                 .WithParsed<FfmpegArgs>(FfmpegHandler.ParseArgs)
+                .WithParsed<CurlArgs>(CurlHandler.ParseArgs)
                 .WithParsed<CacheArgs>(CacheHandler.ParseArgs);
         }
 

TwitchDownloaderCLI/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "TwitchDownloaderCLI": {
       "commandName": "Project",
-      "commandLineArgs": "chatrender -i chat.json --badge-filter 255 -o chat.mp4"
+      "commandLineArgs": "curl --download"
     },
     "WSL": {
       "commandName": "WSL2",

TwitchDownloaderCLI/Tools/CurlHandler.cs

@@ -0,0 +1,70 @@
+using ICSharpCode.SharpZipLib.GZip;
+using ICSharpCode.SharpZipLib.Tar;
+using Microsoft.Extensions.Hosting.Internal;
+using Mono.Unix;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net.Http;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using TwitchDownloaderCLI.Modes.Arguments;
+
+namespace TwitchDownloaderCLI.Tools
+{
+    public class CurlHandler
+    {
+        public static readonly string[] FilesToExtract = new string[] { "curl-ca-bundle.crt", "libcurl.dll", "libcurl.a", "libcurldll.a",  };
+
+        public static void DetectCurl(string curlImpersonatePath)
+        {
+            throw new NotImplementedException();
+
+            Console.WriteLine("[ERROR] - Unable to find curl-impersonate, exiting.");
+            Environment.Exit(1);
+        }
+        public static void ParseArgs(CurlArgs args)
+        {
+            if (args.DownloadCurl)
+            {
+                DownloadCurl(args).Wait();
+            }
+        }
+
+        private static async Task DownloadCurl(CurlArgs args)
+        {
+            using HttpClient httpClient = new HttpClient();
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                using (HttpResponseMessage response = await httpClient.GetAsync("https://github.com/depler/curl-impersonate-win/releases/download/20230227/curl-impersonate-win.zip"))
+                using (Stream streamToReadFrom = await response.Content.ReadAsStreamAsync())
+                {
+                    using (var fs = new FileStream("curl-impersonate-win.zip", FileMode.Create))
+                    {
+                        await response.Content.CopyToAsync(fs);
+                    }
+                }
+
+                using (var archive = ZipFile.OpenRead("curl-impersonate-win.zip"))
+                {
+                    foreach (var item in archive.Entries)
+                    {
+                        if (FilesToExtract.Contains(item.Name))
+                        {
+                            item.ExtractToFile(Path.Combine(Directory.GetCurrentDirectory(), item.FullName.Replace("curl-impersonate-win/", "")), true);
+                        }
+                    }
+                }
+
+                File.Delete("curl-impersonate-win.zip");
+            }
+            else
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}

TwitchDownloaderCLI/TwitchDownloaderCLI.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
+    <PackageReference Include="SharpZipLib" Version="1.4.2" />
     <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
     <PackageReference Include="Xabe.FFmpeg.Downloader" Version="5.2.6" />
   </ItemGroup>

TwitchDownloaderCore/Chat/ChatHtml.cs

@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using System.Web;
 using TwitchDownloaderCore.Tools;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.VideoPlatforms.Twitch;
 
 namespace TwitchDownloaderCore.Chat
 {
@@ -37,7 +37,7 @@ public static class ChatHtml
             var outputDirectory = Directory.GetParent(Path.GetFullPath(filePath))!;
             if (!outputDirectory.Exists)
             {
-                TwitchHelper.CreateDirectory(outputDirectory.FullName);
+                PlatformHelper.CreateDirectory(outputDirectory.FullName);
             }
 
             await using var fs = File.Create(filePath);

TwitchDownloaderCore/Chat/ChatJson.cs

@@ -8,7 +8,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using TwitchDownloaderCore.Extensions;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.Tools;
+using TwitchDownloaderCore.VideoPlatforms.Twitch;
 
 namespace TwitchDownloaderCore.Chat
 {
@@ -71,6 +72,11 @@ public static class ChatJson
                 returnChatRoot.video = videoElement.Deserialize<Video>(options: _jsonSerializerOptions);
             }
 
+            if (jsonDocument.RootElement.TryGetProperty("videoPlatform", out JsonElement platformElement))
+            {
+                returnChatRoot.videoPlatform = platformElement.Deserialize<VideoPlatform>(options: _jsonSerializerOptions);
+            }
+
             if (getComments)
             {
                 if (jsonDocument.RootElement.TryGetProperty("comments", out JsonElement commentsElement))
@@ -155,7 +161,7 @@ public static async Task SerializeAsync(string filePath, ChatRoot chatRoot, Chat
             var outputDirectory = Directory.GetParent(Path.GetFullPath(filePath))!;
             if (!outputDirectory.Exists)
             {
-                TwitchHelper.CreateDirectory(outputDirectory.FullName);
+                PlatformHelper.CreateDirectory(outputDirectory.FullName);
             }
 
             await using var fs = File.Create(filePath);

TwitchDownloaderCore/Chat/ChatText.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using TwitchDownloaderCore.Tools;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.VideoPlatforms.Twitch;
 
 namespace TwitchDownloaderCore.Chat
 {
@@ -18,7 +18,7 @@ public static async Task SerializeAsync(string filePath, ChatRoot chatRoot, Time
             var outputDirectory = Directory.GetParent(Path.GetFullPath(filePath))!;
             if (!outputDirectory.Exists)
             {
-                TwitchHelper.CreateDirectory(outputDirectory.FullName);
+                PlatformHelper.CreateDirectory(outputDirectory.FullName);
             }
 
             await using var sw = new StreamWriter(filePath);