daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Finish experimental version of voice utils

Browse source
This commit is contained in:
Runebaas 2018-01-11 01:16:30 +01:00
parent 1ee627a915
commit ceff1cc3b9
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
3 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
Geekbot.net/bin Geekbot.net/bin
Geekbot.net/obj Geekbot.net/obj
Geekbot.net/tmp/
Tests/bin Tests/bin
Tests/obj Tests/obj
Backup/ Backup/

7
Geekbot.net/Commands/Voice.cs
View file

@ -57,10 +57,12 @@ namespace Geekbot.net.Commands
await audioClient.StopAsync(); await audioClient.StopAsync();
await ReplyAsync("Disconnected from channel!"); await ReplyAsync("Disconnected from channel!");
_audioUtils.Cleanup(Context.Guild.Id);
} }
catch (Exception e) catch (Exception e)
{ {
_errorHandler.HandleCommandException(e, Context); _errorHandler.HandleCommandException(e, Context);
_audioUtils.Cleanup(Context.Guild.Id);
} }
} }
@ -80,15 +82,20 @@ namespace Geekbot.net.Commands
await ReplyAsync("I'm not in a voice channel at the moment"); await ReplyAsync("I'm not in a voice channel at the moment");
return; return;
} }
var message = await Context.Channel.SendMessageAsync("Just a second, i'm still a bit slow at this");
var ffmpeg = _audioUtils.CreateStreamFromYoutube(url, Context.Guild.Id); var ffmpeg = _audioUtils.CreateStreamFromYoutube(url, Context.Guild.Id);
var output = ffmpeg.StandardOutput.BaseStream; var output = ffmpeg.StandardOutput.BaseStream;
await message.ModifyAsync(msg => msg.Content = "**Playing!** Please note that this feature is experimental");
var discord = audioClient.CreatePCMStream(Discord.Audio.AudioApplication.Mixed); var discord = audioClient.CreatePCMStream(Discord.Audio.AudioApplication.Mixed);
await output.CopyToAsync(discord); await output.CopyToAsync(discord);
await discord.FlushAsync(); await discord.FlushAsync();
_audioUtils.Cleanup(Context.Guild.Id);
} }
catch (Exception e) catch (Exception e)
{ {
_errorHandler.HandleCommandException(e, Context); _errorHandler.HandleCommandException(e, Context);
_audioUtils.Cleanup(Context.Guild.Id);
} }
} }
} }

37
Geekbot.net/Lib/AudioClientCache.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Net;
using System.Security.Cryptography; using System.Security.Cryptography;
using Discord.Audio; using Discord.Audio;
using Discord.Net; using Discord.Net;
@ -16,11 +17,12 @@ namespace Geekbot.net.Lib
public AudioUtils() public AudioUtils()
{ {
_audioClients = new Dictionary<ulong, IAudioClient>(); _audioClients = new Dictionary<ulong, IAudioClient>();
_tempFolderPath = Path.GetFullPath("./temp/"); _tempFolderPath = Path.GetFullPath("./tmp/");
if (!Directory.Exists(_tempFolderPath)) if (Directory.Exists(_tempFolderPath))
{ {
Directory.CreateDirectory(_tempFolderPath); Directory.Delete(_tempFolderPath, true);
} }
Directory.CreateDirectory(_tempFolderPath);
} }
public IAudioClient GetAudioClient(ulong guildId) public IAudioClient GetAudioClient(ulong guildId)
@ -49,7 +51,12 @@ namespace Geekbot.net.Lib
{ {
var ytdlMediaUrl = GetYoutubeMediaUrl(url); var ytdlMediaUrl = GetYoutubeMediaUrl(url);
DownloadMediaUrl(ytdlMediaUrl, guildId); DownloadMediaUrl(ytdlMediaUrl, guildId);
return CreateStreamFromFile($"{_tempFolderPath}\\{guildId}.mp3"); return CreateStreamFromFile($"{_tempFolderPath}{guildId}");
}
public void Cleanup(ulong guildId)
{
File.Delete($"{_tempFolderPath}{guildId}");
} }
private string GetYoutubeMediaUrl(string url) private string GetYoutubeMediaUrl(string url)
@ -64,21 +71,26 @@ namespace Geekbot.net.Lib
var output = Process.Start(ytdl).StandardOutput.ReadToEnd(); var output = Process.Start(ytdl).StandardOutput.ReadToEnd();
if (string.IsNullOrWhiteSpace(output)) if (string.IsNullOrWhiteSpace(output))
{ {
throw new System.Exception("Could not get Youtube Media URL"); throw new Exception("Could not get Youtube Media URL");
} }
return output; return output;
} }
private void DownloadMediaUrl(string url, ulong guildId) private void DownloadMediaUrl(string url, ulong guildId)
{ {
var ffmpeg = new ProcessStartInfo using (var web = new WebClient())
{ {
FileName = "ffmpeg", web.DownloadFile(url, $"{_tempFolderPath}{guildId}");
Arguments = $"-re -i \"${url}\" -c:a mp3 -b:a 256k {_tempFolderPath}\\{guildId}.mp3", }
UseShellExecute = false, // var ffmpeg = new ProcessStartInfo
RedirectStandardOutput = true, // {
}; // FileName = "ffmpeg",
Process.Start(ffmpeg).WaitForExit(); // Arguments = $"-i \"{_tempFolderPath}{guildId}\" -c:a mp3 -b:a 256k {_tempFolderPath}{guildId}.mp3",
// UseShellExecute = false,
// RedirectStandardOutput = true,
// };
// Process.Start(ffmpeg).WaitForExit();
// File.Delete($"{_tempFolderPath}{guildId}");
return; return;
} }
} }
@ -89,5 +101,6 @@ namespace Geekbot.net.Lib
void StoreAudioClient(ulong guildId, IAudioClient client); void StoreAudioClient(ulong guildId, IAudioClient client);
Process CreateStreamFromFile(string path); Process CreateStreamFromFile(string path);
Process CreateStreamFromYoutube(string url, ulong guildId); Process CreateStreamFromYoutube(string url, ulong guildId);
void Cleanup(ulong guildId);
} }
} }