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

Fixed song spam for good

Browse Source
This commit is contained in:
Master Kwoth 2017-07-07 09:54:25 +02:00
parent 8331af2870
commit 793cbdf608
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NadekoBot/Services/Music/MusicPlayer.cs
View File

@ -113,6 +113,8 @@ namespace NadekoBot.Services.Music
private bool newVoiceChannel = false;
private readonly IGoogleApiService _google;
private bool cancel = false;
private ConcurrentHashSet<string> RecentlyPlayedUsers { get; } = new ConcurrentHashSet<string>();
public TimeSpan TotalPlaytime
{
@ -148,6 +150,7 @@ namespace NadekoBot.Services.Music
while (!Exited)
{
_bytesSent = 0;
cancel = false;
CancellationToken cancelToken;
(int Index, SongInfo Song) data;
lock (locker)
@ -210,6 +213,7 @@ namespace NadekoBot.Services.Music
catch (OperationCanceledException)
{
_log.Info("Song Canceled");
cancel = true;
}
catch (Exception ex)
{
@ -230,6 +234,13 @@ namespace NadekoBot.Services.Music
}
OnCompleted?.Invoke(this, data.Song);
if (_bytesSent == 0 && !cancel)
{
lock (locker)
Queue.RemoveSong(data.Song);
_log.Info("Song removed because it can't play");
}
}
}
try
@ -319,7 +330,6 @@ namespace NadekoBot.Services.Music
}
do
{
_log.Info("Waiting for something to happen");
await Task.Delay(500);
}
while ((Queue.Count == 0 || Stopped) && !Exited);

8
src/NadekoBot/Services/Music/MusicQueue.cs
View File

@ -163,5 +163,13 @@ namespace NadekoBot.Services.Music
return s;
}
}
public void RemoveSong(SongInfo song)
{
lock (locker)
{
Songs.Remove(song);
}
}
}
}