update dependencies

Etherna · May 28, 2023 · ae8577f · ae8577f
1 parent 1bb070d
commit ae8577f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/src/EthernaVideoImporter.Core/EthernaVideoImporter.Core.csproj b/src/EthernaVideoImporter.Core/EthernaVideoImporter.Core.csproj
@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Bee.Net" Version="0.2.0-alpha.189" />
     <PackageReference Include="Blurhash.SkiaSharp" Version="2.0.0" />
-    <PackageReference Include="Etherna.YoutubeDownloader.Converter" Version="6.3.3" />
+    <PackageReference Include="Etherna.YoutubeDownloader.Converter" Version="6.3.4" />
     <PackageReference Include="EthernaServicesClient" Version="0.3.0-alpha.60" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
       <PrivateAssets>all</PrivateAssets>
@@ -46,7 +46,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.30.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.30.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EthernaVideoImporter.Devcon/EthernaVideoImporter.Devcon.csproj b/src/EthernaVideoImporter.Devcon/EthernaVideoImporter.Devcon.csproj
@@ -37,7 +37,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="YamlDotNet" Version="13.0.2" />
+    <PackageReference Include="YamlDotNet" Version="13.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EthernaVideoImporter.Devcon/Program.cs b/src/EthernaVideoImporter.Devcon/Program.cs
@@ -261,13 +261,7 @@ static async Task Main(string[] args)
                 },
                 useBeeNativeNode,
                 authResult.RefreshTokenHandler);
-            services.AddTransient<IYoutubeClient>(_ =>
-                ffMpegHwAcceleration switch
-                {
-                    FFMpegHwAccelerations.None => new YoutubeClient(),
-                    FFMpegHwAccelerations.Cuda => new YoutubeClient("cuda"),
-                    _ => throw new InvalidOperationException()
-                });
+            services.AddTransient<IYoutubeClient, YoutubeClient>();
             services.AddTransient<IYoutubeDownloader, YoutubeDownloader>();
             services.AddTransient<IVideoProvider, MdVideoProvider>();
 

diff --git a/src/EthernaVideoImporter/Program.cs b/src/EthernaVideoImporter/Program.cs
@@ -308,7 +308,8 @@ static async Task Main(string[] args)
                     services.AddSingleton<IValidateOptions<YouTubeChannelVideoProviderOptions>, YouTubeChannelVideoProviderOptionsValidation>();
 
                     //services
-                    AddYoutubeDownloader(services, ffMpegHwAcceleration);
+                    services.AddTransient<IYoutubeClient, YoutubeClient>();
+                    services.AddTransient<IYoutubeDownloader, YoutubeDownloader>();
                     services.AddTransient<IVideoProvider, YouTubeChannelVideoProvider>();
                     break;
                 case SourceType.YouTubeVideo:
@@ -320,7 +321,8 @@ static async Task Main(string[] args)
                     services.AddSingleton<IValidateOptions<YouTubeSingleVideoProviderOptions>, YouTubeSingleVideoProviderOptionsValidation>();
 
                     //services
-                    AddYoutubeDownloader(services, ffMpegHwAcceleration);
+                    services.AddTransient<IYoutubeClient, YoutubeClient>();
+                    services.AddTransient<IYoutubeDownloader, YoutubeDownloader>();
                     services.AddTransient<IVideoProvider, YouTubeSingleVideoProvider>();
                     break;
                 default:
@@ -340,20 +342,5 @@ await importer.RunAsync(
                 userEthAddr,
                 unpinRemovedVideos);
         }
-
-        // Helpers.
-        private static void AddYoutubeDownloader(
-            ServiceCollection services,
-            FFMpegHwAccelerations hwAcceleration)
-        {
-            services.AddTransient<IYoutubeClient>(_ =>
-                hwAcceleration switch
-                {
-                    FFMpegHwAccelerations.None => new YoutubeClient(),
-                    FFMpegHwAccelerations.Cuda => new YoutubeClient("cuda"),
-                    _ => throw new InvalidOperationException()
-                });
-            services.AddTransient<IYoutubeDownloader, YoutubeDownloader>();
-        }
     }
 }