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

.sad, .smch now persist restarts. .usmch added to unset music channel, since destroying a player won't reset it, Added --start-delay option for .race command

Browse Source
This commit is contained in:
Master Kwoth
2017-11-28 02:50:24 +07:00
parent 2ea157902e
commit 60e248c78a
10 changed files with 2168 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
NadekoBot.Core/Modules/Music/Common/MusicPlayer.cs
View File

@ -11,6 +11,7 @@ using NadekoBot.Common.Collections;
using NadekoBot.Modules.Music.Services;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using Discord.WebSocket;
namespace NadekoBot.Modules.Music.Common
{
@ -25,6 +26,8 @@ namespace NadekoBot.Modules.Music.Common
{
private readonly Thread _player;
public IVoiceChannel VoiceChannel { get; private set; }
private readonly ITextChannel _originalTextChannel;
private readonly Logger _log;
private MusicQueue Queue { get; } = new MusicQueue();
@ -130,15 +133,19 @@ namespace NadekoBot.Modules.Music.Common
: new TimeSpan(songs.Sum(s => s.TotalTime.Ticks));
}
}
public MusicPlayer(MusicService musicService, IGoogleApiService google, IVoiceChannel vch, ITextChannel output, float volume)
public MusicPlayer(MusicService musicService, MusicSettings ms, IGoogleApiService google,
IVoiceChannel vch, ITextChannel original, float volume)
{
_log = LogManager.GetCurrentClassLogger();
this.Volume = volume;
this.VoiceChannel = vch;
this._originalTextChannel = original;
this.SongCancelSource = new CancellationTokenSource();
this.OutputTextChannel = output;
if(ms.MusicChannelId is ulong cid)
{
this.OutputTextChannel = ((SocketGuild)original.Guild).GetTextChannel(cid) ?? original;
}
this._musicService = musicService;
this._google = google;
@ -657,6 +664,11 @@ namespace NadekoBot.Modules.Music.Common
public SongInfo MoveSong(int n1, int n2)
=> Queue.MoveSong(n1, n2);
public void SetMusicChannelToOriginal()
{
this.OutputTextChannel = _originalTextChannel;
}
//// this should be written better
//public TimeSpan TotalPlaytime =>
// _playlist.Any(s => s.TotalTime == TimeSpan.MaxValue) ?

14
NadekoBot.Core/Modules/Music/Services/MusicService.cs
View File

@ -15,6 +15,7 @@ using NadekoBot.Modules.Music.Common;
using NadekoBot.Modules.Music.Common.Exceptions;
using NadekoBot.Modules.Music.Common.SongResolver;
using NadekoBot.Common.Collections;
using System;
namespace NadekoBot.Modules.Music.Services
{
@ -27,6 +28,7 @@ namespace NadekoBot.Modules.Music.Services
private readonly ILocalization _localization;
private readonly DbService _db;
private readonly Logger _log;
private readonly ConcurrentDictionary<ulong, MusicSettings> _musicSettings;
private readonly SoundCloudApiService _sc;
private readonly IBotCredentials _creds;
private readonly ConcurrentDictionary<ulong, float> _defaultVolumes;
@ -49,6 +51,8 @@ namespace NadekoBot.Modules.Music.Services
_sc = sc;
_creds = creds;
_log = LogManager.GetCurrentClassLogger();
_musicSettings = bot.AllGuildConfigs.ToDictionary(x => x.GuildId, x => x.MusicSettings)
.ToConcurrent();
_client.LeftGuild += _client_LeftGuild;
@ -110,7 +114,10 @@ namespace NadekoBot.Modules.Music.Services
return MusicPlayers.GetOrAdd(guildId, _ =>
{
var vol = GetDefaultVolume(guildId);
var mp = new MusicPlayer(this, _google, voiceCh, textCh, vol);
if (!_musicSettings.TryGetValue(guildId, out var ms))
ms = new MusicSettings();
var mp = new MusicPlayer(this, ms, _google, voiceCh, textCh, vol);
IUserMessage playingMessage = null;
IUserMessage lastFinishedMessage = null;
@ -264,5 +271,10 @@ namespace NadekoBot.Modules.Music.Services
return val;
}
public void UpdateSettings(ulong id, MusicSettings musicSettings)
{
_musicSettings.AddOrUpdate(id, musicSettings, delegate { return musicSettings; });
}
}
}