merge hotfix

.github/workflows/nuget-stable-deploy.yml

@@ -0,0 +1,32 @@
+name: Stable release deploy to NuGet
+
+on:
+  push:
+    tags:
+    - 'eth-v*.*.*'
+
+jobs:
+  build-test-package:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '7.0.x'
+
+    - name: Build with dotnet
+      run: dotnet build --configuration Release
+
+    - name: Run unit tests
+      run: dotnet test --configuration Release
+
+    - name: Generate nuget package
+      run: dotnet pack --configuration Release -o nupkg
+
+    - name: Push packages
+      run: dotnet nuget push './nupkg/*.nupkg' --api-key ${{secrets.NUGET_KEY}} --source https://api.nuget.org/v3/index.json

Changelog.md

@@ -1,3 +1,13 @@
+
+# Attention
+
+These are changelogs from original repository.
+
+Etherna changelogs instead are under github's releases:  
+https://github.com/Etherna/YoutubeExplode/releases
+
+*************
+
 # Changelog
 
 ## v6.2.10 (17-Mar-2023)

Directory.Build.props

@@ -1,9 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <Version>6.2.10</Version>
-    <Company>Tyrrrz</Company>
-    <Copyright>Copyright (C) Oleksii Holub</Copyright>
+    <Company>Etherna Sagl</Company>
+    <Copyright>Copyright (C) Oleksii Holub, Copyright (C) 2023 Etherna Sagl</Copyright>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
@@ -20,19 +19,13 @@
   <PropertyGroup>
     <Authors>$(Company)</Authors>
     <PackageTags>youtube video download playlist user channel closed caption tracks subtitles parse extract metadata info net core standard</PackageTags>
-    <PackageProjectUrl>https://github.com/Tyrrrz/YoutubeExplode</PackageProjectUrl>
-    <PackageReleaseNotes>https://github.com/Tyrrrz/YoutubeExplode/blob/master/Changelog.md</PackageReleaseNotes>
+    <PackageProjectUrl>https://github.com/Etherna/youtube-downloader</PackageProjectUrl>
     <PackageReadmeFile>Readme.md</PackageReadmeFile>
-    <PackageIcon>favicon.png</PackageIcon>
     <PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="../favicon.png" Pack="true" PackagePath="" Visible="false" />
-  </ItemGroup>
-
 </Project>

GitVersion.yml

@@ -0,0 +1 @@
+tag-prefix: 'eth-v'

License.txt → LICENSE

@@ -1,5 +1,8 @@
  YoutubeExplode
  Copyright (C) 2016-2023 Oleksii Holub
+
+ Etherna YoutubeDownloader fork
+ Copyright (C) 2023-present Etherna Sagl
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by

YoutubeExplode.Converter.Tests/YoutubeExplode.Converter.Tests.csproj → YoutubeDownloader.Converter.Tests/YoutubeDownloader.Converter.Tests.csproj

@@ -11,7 +11,6 @@
   <ItemGroup>
     <PackageReference Include="CliWrap" Version="3.6.0" />
     <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
@@ -20,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YoutubeExplode.Converter\YoutubeExplode.Converter.csproj" />
+    <ProjectReference Include="..\YoutubeDownloader.Converter\YoutubeDownloader.Converter.csproj" />
   </ItemGroup>
 
 </Project>

YoutubeExplode.Converter/ConversionExtensions.cs → YoutubeDownloader.Converter/ConversionExtensions.cs

@@ -75,7 +75,7 @@ public static async ValueTask DownloadAsync(
         IProgress<double>? progress = null,
         CancellationToken cancellationToken = default)
     {
-        var ffmpeg = new FFmpeg(request.FFmpegCliFilePath);
+        var ffmpeg = new FFmpeg(request.FFmpegCliFilePath, videoClient.FFmpegHWAccelerationMethod);
         var converter = new Converter(videoClient, ffmpeg, request.Preset);
 
         await converter.ProcessAsync(

YoutubeExplode.Converter/Converter.cs → YoutubeDownloader.Converter/Converter.cs

@@ -36,6 +36,10 @@ private async ValueTask ProcessAsync(
     {
         var arguments = new ArgumentsBuilder();
 
+        // Add HW acceleration
+        if (_ffmpeg.HWAccelerationMethod is not null)
+            arguments.Add("-hwaccel").Add(_ffmpeg.HWAccelerationMethod);
+
         // Stream inputs
         foreach (var streamInput in streamInputs)
             arguments.Add("-i").Add(streamInput.FilePath);
@@ -88,9 +92,16 @@ private async ValueTask ProcessAsync(
             }
         }
 
-        // MP4: specify the codec for subtitles manually, otherwise they may not get injected
-        if (container == Container.Mp4 && subtitleInputs.Any())
-            arguments.Add("-c:s").Add("mov_text");
+        // MP4
+        if (container == Container.Mp4)
+        {
+            //specify the codec for subtitles manually, otherwise they may not get injected
+            if (subtitleInputs.Any())
+                arguments.Add("-c:s").Add("mov_text");
+
+            //move the index (moov atom) to the beginning of the file
+            arguments.Add("-movflags").Add("faststart");
+        }
 
         // MP3: set constant bitrate for audio streams, otherwise the metadata may contain invalid total duration
         // https://superuser.com/a/893044

YoutubeExplode.Converter/FFmpeg.cs → YoutubeDownloader.Converter/FFmpeg.cs

@@ -18,7 +18,15 @@ internal partial class FFmpeg
 {
     private readonly string _filePath;
 
-    public FFmpeg(string filePath) => _filePath = filePath;
+    public FFmpeg(
+        string filePath,
+        string? hwAccelerationMethod)
+    {
+        _filePath = filePath;
+        HWAccelerationMethod = hwAccelerationMethod;
+    }
+
+    public string? HWAccelerationMethod { get; }
 
     public async ValueTask ExecuteAsync(
         string arguments,

YoutubeExplode.Converter/YoutubeExplode.Converter.csproj → YoutubeDownloader.Converter/YoutubeDownloader.Converter.csproj

@@ -3,14 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0;netstandard2.1;netstandard2.0;net461;netcoreapp3.1</TargetFrameworks>
     <IsPackable>true</IsPackable>
+	<PackageId>Etherna.$(AssemblyName)</PackageId>
   </PropertyGroup>
 
   <PropertyGroup>
     <Description>
       Extension for YoutubeExplode that provides an interface to download and convert videos using FFmpeg
     </Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageProjectUrl>https://github.com/Tyrrrz/YoutubeExplode/tree/master/YoutubeExplode.Converter</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/Etherna/youtube-downloader</PackageProjectUrl>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,13 +20,17 @@
 
   <ItemGroup>
     <PackageReference Include="CliWrap" Version="3.6.0" />
+    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="PolySharp" Version="1.12.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YoutubeExplode\YoutubeExplode.csproj" />
+    <ProjectReference Include="..\YoutubeDownloader\YoutubeDownloader.csproj" />
   </ItemGroup>
 
 </Project>

YoutubeExplode.DemoConsole/YoutubeExplode.DemoConsole.csproj → YoutubeDownloader.DemoConsole/YoutubeDownloader.DemoConsole.csproj

@@ -3,11 +3,10 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ApplicationIcon>../favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YoutubeExplode\YoutubeExplode.csproj" />
+    <ProjectReference Include="..\YoutubeDownloader\YoutubeDownloader.csproj" />
   </ItemGroup>
 
 </Project>

YoutubeExplode.DemoWpf/Views/MainWindow.xaml → YoutubeDownloader.DemoWpf/Views/MainWindow.xaml

@@ -11,7 +11,6 @@
     Height="610"
     Background="{DynamicResource MaterialDesignPaper}"
     FocusManager.FocusedElement="{Binding ElementName=QueryTextBox}"
-    Icon="/YoutubeExplode.DemoWpf;component/favicon.ico"
     Style="{DynamicResource MaterialDesignRoot}"
     WindowStartupLocation="CenterScreen">
     <Window.DataContext>

YoutubeExplode.DemoWpf/YoutubeExplode.DemoWpf.csproj → YoutubeDownloader.DemoWpf/YoutubeDownloader.DemoWpf.csproj

@@ -4,20 +4,15 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>../favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Resource Include="../favicon.ico" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="MaterialDesignColors" Version="2.1.1" />
     <PackageReference Include="MaterialDesignThemes" Version="4.7.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YoutubeExplode\YoutubeExplode.csproj" />
+    <ProjectReference Include="..\YoutubeDownloader\YoutubeDownloader.csproj" />
   </ItemGroup>
 
 </Project>

YoutubeExplode.Tests/YoutubeExplode.Tests.csproj → YoutubeDownloader.Tests/YoutubeDownloader.Tests.csproj

@@ -10,15 +10,14 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
     <PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YoutubeExplode\YoutubeExplode.csproj" />
+    <ProjectReference Include="..\YoutubeDownloader\YoutubeDownloader.csproj" />
   </ItemGroup>
 
 </Project>