mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #755 from Nitix/radio

Browse Source 
Fixed radio and slow connection Fix #601
This commit is contained in:
Master Kwoth 2016-11-11 02:03:03 +01:00 committed by GitHub
commit c2434db854
1 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/NadekoBot/Modules/Music/Classes/Song.cs
View File

@ -102,19 +102,42 @@ namespace NadekoBot.Modules.Music.Classes
{ {
var attempt = 0; var attempt = 0;
var prebufferingTask = CheckPrebufferingAsync(inStream, cancelToken); var prebufferingTask = CheckPrebufferingAsync(inStream, cancelToken, 1.MiB()); //Fast connection can do this easy
var finished = false;
var count = 0;
var sw = new Stopwatch(); var sw = new Stopwatch();
var slowconnection = false;
sw.Start(); sw.Start();
var t = await Task.WhenAny(prebufferingTask, Task.Delay(5000, cancelToken)); while (!finished)
if (t != prebufferingTask)
{ {
_log.Debug("Prebuffering timed out or canceled. Cannot get any data from the stream."); var t = await Task.WhenAny(prebufferingTask, Task.Delay(2000, cancelToken));
return; if (t != prebufferingTask)
} {
else if(prebufferingTask.IsCanceled) count++;
{ if (count == 10)
_log.Debug("Prebuffering timed out. Cannot get any data from the stream."); {
return; slowconnection = true;
prebufferingTask = CheckPrebufferingAsync(inStream, cancelToken, 20.MiB());
_log.Warn("Slow connection buffering more to ensure no disruption, consider hosting in cloud");
continue;
}
if (inStream.BufferingCompleted && count == 1)
{
_log.Debug("Prebuffering canceled. Cannot get any data from the stream.");
return;
}
else
{
continue;
}
}
else if (prebufferingTask.IsCanceled)
{
_log.Debug("Prebuffering canceled. Cannot get any data from the stream.");
return;
}
finished = true;
} }
sw.Stop(); sw.Stop();
_log.Debug("Prebuffering successfully completed in "+ sw.Elapsed); _log.Debug("Prebuffering successfully completed in "+ sw.Elapsed);
@ -146,8 +169,13 @@ namespace NadekoBot.Modules.Music.Classes
MusicPlayer.SongCancelSource.Cancel(); MusicPlayer.SongCancelSource.Cancel();
break; break;
} }
if (slowconnection)
{
_log.Warn("Slow connection has disrupted music, waiting a bit for buffer");
await Task.Delay(1000, cancelToken).ConfigureAwait(false);
}
else else
await Task.Delay(100, cancelToken).ConfigureAwait(false); await Task.Delay(100, cancelToken).ConfigureAwait(false);
} }
else else
attempt = 0; attempt = 0;
@ -176,9 +204,9 @@ namespace NadekoBot.Modules.Music.Classes
} }
} }
private async Task CheckPrebufferingAsync(SongBuffer inStream, CancellationToken cancelToken) private async Task CheckPrebufferingAsync(SongBuffer inStream, CancellationToken cancelToken, long size)
{ {
while (!inStream.BufferingCompleted && inStream.Length < 10.MiB()) while (!inStream.BufferingCompleted && inStream.Length < size)
{ {
await Task.Delay(100, cancelToken); await Task.Delay(100, cancelToken);
} }