Merge pull request #9 from madeyoga/linux-macos-support

Linux & macos Support
madeyoga · Apr 9, 2022 · 846349b · 846349b
2 parents 71d9b9b + 895c220
commit 846349b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/Discord.Addons.Music/Common/TrackLoader.cs b/Discord.Addons.Music/Common/TrackLoader.cs
@@ -3,6 +3,7 @@
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Web;
 
@@ -61,10 +62,20 @@ public static async Task<List<AudioTrack>> LoadAudioTrack(string query, bool fro
 
         public static Process LoadFFmpegProcess(string url)
         {
+            string filename = $"/bin/bash";
+            string command = $"-c \"youtube-dl --format bestaudio -o - {url} | ffmpeg -loglevel panic -i pipe:0 -ac 2 -f s16le -ar 48000 pipe:1\"";
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                filename = "cmd.exe";
+                command = $"/C youtube-dl.exe --format bestaudio --audio-quality 0 -o - {url} | " +
+                "ffmpeg.exe -loglevel warning -re -vn -i pipe:0 -f s16le -b:a 128k -ar 48000 -ac 2 pipe:1";
+            }
+
             return Process.Start(new ProcessStartInfo
             {
-                FileName = "cmd.exe",
-                Arguments = $"/C youtube-dl.exe --format --audio-quality 0 bestaudio -o - {url} | ffmpeg.exe -loglevel panic -i pipe:0 -c:a libopus -b:a 96K -ac 2 -f s16le -ar 48000 pipe:1",
+                FileName = filename,
+                Arguments = command,
                 RedirectStandardOutput = true,
                 UseShellExecute = false,
                 CreateNoWindow = true

diff --git a/Discord.Addons.Music/Discord.Addons.Music.csproj b/Discord.Addons.Music/Discord.Addons.Music.csproj
@@ -6,11 +6,11 @@
     <Copyright>MIT</Copyright>
     <PackageProjectUrl>https://github.com/madeyoga/Discord.Addons.Music</PackageProjectUrl>
     <RepositoryUrl>https://github.com/madeyoga/Discord.Addons.Music</RepositoryUrl>
-    <Version>0.1.1</Version>
+    <Version>0.2.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
+    <FileVersion>0.2.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Discord.Addons.Music/Source/AudioTrack.cs b/Discord.Addons.Music/Source/AudioTrack.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -11,11 +12,19 @@ public class AudioTrack : FFmpegAudioSource
 
         public override void LoadProcess()
         {
-            string command = $"/C youtube-dl.exe --format bestaudio --audio-quality 0 -o - {Url} | " +
+            string filename = $"/bin/bash";
+            string command = $"-c \"youtube-dl --format bestaudio -o - {Url} | ffmpeg -loglevel panic -i pipe:0 -ac 2 -f s16le -ar 48000 pipe:1\"";
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                filename = "cmd.exe";
+                command = $"/C youtube-dl.exe --format bestaudio --audio-quality 0 -o - {Url} | " +
                 "ffmpeg.exe -loglevel warning -re -vn -i pipe:0 -f s16le -b:a 128k -ar 48000 -ac 2 pipe:1";
+            }
+
             FFmpegProcess = Process.Start(new ProcessStartInfo
             {
-                FileName = "cmd.exe",
+                FileName = filename,
                 Arguments = command,
                 RedirectStandardOutput = true,
                 UseShellExecute = false,

diff --git a/ExampleMusicBot/ExampleMusicBot.csproj b/ExampleMusicBot/ExampleMusicBot.csproj
@@ -7,13 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Discord.Addons.Music" Version="0.2.0" />
     <PackageReference Include="Discord.Net" Version="2.4.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
     <PackageReference Include="YoutubeSearchApi.Net" Version="2021.8.24" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Discord.Addons.Music\Discord.Addons.Music.csproj" />
-  </ItemGroup>
-
 </Project>