Go from youtube-dl to yt-dlp (with a fixed known working version)

Author: mortenmoulder

Application.cs

@@ -11,15 +11,15 @@ namespace TwitchClipper
     public class Application
     {
         private readonly ITwitchAPIService _twitchService;
-        private readonly IYouTubeDLService _youtubeDlService;
+        private readonly IDownloaderService _downloaderService;
         private readonly IHostService _hostService;
         private readonly IGitHubUpdater _updater;
         private readonly IArchivingService _archivingService;
 
-        public Application(ITwitchAPIService twitchService, IYouTubeDLService youtubeDlService, IHostService hostService, IGitHubUpdater updater, IArchivingService archivingService)
+        public Application(ITwitchAPIService twitchService, IDownloaderService downloaderService, IHostService hostService, IGitHubUpdater updater, IArchivingService archivingService)
         {
             _twitchService = twitchService;
-            _youtubeDlService = youtubeDlService;
+            _downloaderService = downloaderService;
             _hostService = hostService;
             _updater = updater;
             _archivingService = archivingService;
@@ -38,7 +38,7 @@ public async Task Run(Options options)
             //yes, placing this here is really bad. Please don't blame me
             await TestCustomPathExpression();
 
-            await _youtubeDlService.CheckYouTubeDLExists();
+            await _downloaderService.CheckExecutableExists();
 
             await _twitchService.EnsureAuthTokenSet();
 
@@ -54,7 +54,7 @@ public async Task Run(Options options)
                 await ErrorHelper.LogAndExit("No clips found in the given period.");
             }
 
-            await _youtubeDlService.DownloadClips(clips);
+            await _downloaderService.DownloadClips(clips);
         }
 
         private async Task TestCustomPathExpression()

Program.cs

@@ -126,7 +126,7 @@ private static IServiceCollection ConfigureServices()
             services.AddTransient<ITwitchAPIService, TwitchAPIService>();
             services.AddScoped<IConfigurationService, ConfigurationService>();
             services.AddScoped<ITwitchConfigurationService, TwitchConfigurationService>();
-            services.AddTransient<IYouTubeDLService, YouTubeDLService>();
+            services.AddTransient<IDownloaderService, DownloaderService>();
             services.AddScoped<IHostService, HostService>();
             services.AddSingleton<IFilteringService, FilteringService>();
             services.AddTransient<IGitHubUpdater, GitHubUpdater>();

README.md

@@ -5,7 +5,7 @@
 
 <hr>
 
-TwitchClipper is a .NET 5.0 cross platform compatible application, made to download https://twitch.tv clips. Downloading is done via [youtube-dl](https://yt-dl.org/), which will automatically be downloaded and saved in the project's folder.
+TwitchClipper is a .NET 5.0 cross platform compatible application, made to download https://twitch.tv clips. Downloading is done via [yt-dlp](https://github.com/yt-dlp/yt-dlp), which will automatically be downloaded and saved in the project's folder.
 
 ```
 $ ./twitchclipper --username Asmongold --from 2021-05-01 --to 2021-06-01
@@ -59,7 +59,7 @@ There's a section called `TwitchConfiguration` you need to modify:
 
 Replace `CLIENT_ID_GOES_HERE` and `CLIENT_SECRET_GOES_HERE` with your newly found values.
 
-`DownloadThreads` spawns x amount of youtube-dl instances. The higher the number, the faster your download will be. I do not recommend going over 10, as you might get throttled by Twitch.
+`DownloadThreads` spawns x amount of yt-dlp instances. The higher the number, the faster your download will be. I do not recommend going over 10, as you might get throttled by Twitch.
 
 Optionally you can also modify the `Download` section, if you want to customize where your clips are saved:
 

Services/YouTubeDLService.cs Services/DownloaderService.csServices/YouTubeDLService.cs renamed to Services/DownloaderService.cs

@@ -12,33 +12,33 @@
 
 namespace TwitchClipper.Services
 {
-    public interface IYouTubeDLService
+    public interface IDownloaderService
     {
-        Task CheckYouTubeDLExists();
+        Task CheckExecutableExists();
         Task DownloadClips(List<TwitchClipModel> clips);
     }
 
-    public class YouTubeDLService : IYouTubeDLService
+    public class DownloaderService : IDownloaderService
     {
         private readonly IHostService _hostService;
         private readonly ITwitchConfigurationService _twitchConfigurationService;
         private readonly IArchivingService _archivingService;
 
-        public YouTubeDLService(IHostService hostService, ITwitchConfigurationService twitchConfigurationService, IArchivingService archivingService)
+        public DownloaderService(IHostService hostService, ITwitchConfigurationService twitchConfigurationService, IArchivingService archivingService)
         {
             _hostService = hostService;
             _twitchConfigurationService = twitchConfigurationService;
             _archivingService = archivingService;
         }
 
-        public async Task CheckYouTubeDLExists()
+        public async Task CheckExecutableExists()
         {
-            if (!File.Exists(await _hostService.GetYouTubeDlExecutablePath()))
+            if (!File.Exists(await _hostService.GetDownloaderExecutablePath()))
             {
                 ConsoleKey response;
                 do
                 {
-                    await LogHelper.Log("Seems like youtube-dl has not been found. Would you like me to download it for you? [y/n]");
+                    await LogHelper.Log("Seems like yt-dlp has not been found. Would you like me to download it for you? [y/n]");
                     response = Console.ReadKey(false).Key;
 
                     if (response != ConsoleKey.Enter)
@@ -49,23 +49,23 @@ public async Task CheckYouTubeDLExists()
 
                 if (response == ConsoleKey.N)
                 {
-                    await ErrorHelper.LogAndExit("You decided not to download youtube-dl, therefore the application must exit. youtube-dl is a requirement.");
+                    await ErrorHelper.LogAndExit("You decided not to download yt-dlp, therefore the application must exit. yt-dlp is a requirement.");
                 }
                 else if (response == ConsoleKey.Y)
                 {
                     await LogHelper.Log("Download starting");
 
                     using (var httpClient = new HttpClient())
-                    using (var httpResponse = await httpClient.GetAsync(await _hostService.GetYouTubeDlDownloadUrl()))
+                    using (var httpResponse = await httpClient.GetAsync(await _hostService.GetDownloaderDownloadUrl()))
                     {
                         if (httpResponse.IsSuccessStatusCode)
                         {
-                            await File.WriteAllBytesAsync(await _hostService.GetYouTubeDlExecutablePath(), await httpResponse.Content.ReadAsByteArrayAsync());
+                            await File.WriteAllBytesAsync(await _hostService.GetDownloaderExecutablePath(), await httpResponse.Content.ReadAsByteArrayAsync());
 
                             //set magic executable permission on Linux and OSX.. very ugly
                             if (!(await _hostService.GetOSPlatform() == OSPlatform.Windows))
                             {
-                                await ProcessEx.RunAsync("/bin/bash", $"-c \"chmod +x {await _hostService.GetYouTubeDlExecutablePath()}\"");
+                                await ProcessEx.RunAsync("/bin/bash", $"-c \"chmod +x {await _hostService.GetDownloaderExecutablePath()}\"");
                             }
                         }
                     }
@@ -95,7 +95,7 @@ await ParallelExtensions.ParallelForEachAsync(clips, async clip =>
                 if (!File.Exists(path))
                 {
                     counter++;
-                    await ProcessEx.RunAsync(await _hostService.GetYouTubeDlExecutablePath(), $"{clip.Url} -o \"{path}\"");
+                    await ProcessEx.RunAsync(await _hostService.GetDownloaderExecutablePath(), $"{clip.Url} -o \"{path}\"");
                     await LogHelper.Log($"Downloading clip {counter}/{nonExistingClips.Count} using {await _twitchConfigurationService.GetDownloadThreads()} download threads", asyncLock);
                 }
             }, await _twitchConfigurationService.GetDownloadThreads());

Services/HostService.cs

@@ -12,8 +12,8 @@ namespace TwitchClipper.Services
 {
     public interface IHostService
     {
-        Task<string> GetYouTubeDlExecutablePath();
-        Task<string> GetYouTubeDlDownloadUrl();
+        Task<string> GetDownloaderExecutablePath();
+        Task<string> GetDownloaderDownloadUrl();
         Task<OSPlatform> GetOSPlatform();
         Task CreateDirectoryIfNotExists(string path);
         Task<string> ConvertCustomPathExpressionToSavePath(TwitchClipModel model);
@@ -28,18 +28,18 @@ public HostService(IConfigurationService configService)
             _configService = configService;
         }
 
-        public async Task<string> GetYouTubeDlExecutablePath()
+        public async Task<string> GetDownloaderExecutablePath()
         {
             var os = await GetOSPlatform();
 
-            return Path.Combine(Directory.GetCurrentDirectory(), await _configService.GetConfigurationValue<string>($"YouTubeDL:{os}:FileName"));
+            return Path.Combine(Directory.GetCurrentDirectory(), await _configService.GetConfigurationValue<string>($"Downloader:{os}:FileName"));
         }
 
-        public async Task<string> GetYouTubeDlDownloadUrl()
+        public async Task<string> GetDownloaderDownloadUrl()
         {
             var os = await GetOSPlatform();
 
-            return await Task.Run(() => _configService.GetConfigurationValue<string>($"YouTubeDL:{os}:Download"));
+            return await Task.Run(() => _configService.GetConfigurationValue<string>($"Downloader:{os}:Download"));
         }
 
         public async Task<OSPlatform> GetOSPlatform()

TwitchClipper.csproj

@@ -11,7 +11,7 @@
 		<Authors>mortenmoulder</Authors>
 		<PackageProjectUrl>https://github.com/mortenmoulder/TwitchClipper</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/mortenmoulder/TwitchClipper</RepositoryUrl>
-		<Version>1.0.7</Version>
+		<Version>1.0.8</Version>
 	</PropertyGroup>
 
 	<ItemGroup>