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

you can now load only 1 playlist at a time using .load, because it's expensive

Browse Source
This commit is contained in:
Master Kwoth 2017-07-02 19:20:04 +02:00
parent 196f40e648
commit 9f3c04c93e
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/NadekoBot/Modules/Music/Music.cs
View File

@ -470,7 +470,7 @@ namespace NadekoBot.Modules.Music
.AddField(efb => efb.WithName(GetText("id")).WithValue(playlist.Id.ToString()))); .AddField(efb => efb.WithName(GetText("id")).WithValue(playlist.Id.ToString())));
} }
private readonly ConcurrentHashSet<ulong> PlaylistLoadBlacklist = new ConcurrentHashSet<ulong>(); private static readonly ConcurrentHashSet<ulong> PlaylistLoadBlacklist = new ConcurrentHashSet<ulong>();
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
@ -544,8 +544,7 @@ namespace NadekoBot.Modules.Music
var song = await _music.ResolveSong(query, Context.User.ToString(), MusicType.Soundcloud); var song = await _music.ResolveSong(query, Context.User.ToString(), MusicType.Soundcloud);
await InternalQueue(mp, song, false).ConfigureAwait(false); await InternalQueue(mp, song, false).ConfigureAwait(false);
} }
//todo test soundcloudpl
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
public async Task SoundCloudPl([Remainder] string pl) public async Task SoundCloudPl([Remainder] string pl)
@ -560,19 +559,26 @@ namespace NadekoBot.Modules.Music
using (var http = new HttpClient()) using (var http = new HttpClient())
{ {
var scvids = JObject.Parse(await http.GetStringAsync($"https://scapi.nadekobot.me/resolve?url={pl}").ConfigureAwait(false))["tracks"].ToObject<SoundCloudVideo[]>(); var scvids = JObject.Parse(await http.GetStringAsync($"https://scapi.nadekobot.me/resolve?url={pl}").ConfigureAwait(false))["tracks"].ToObject<SoundCloudVideo[]>();
IUserMessage msg = null;
try { msg = await Context.Channel.SendMessageAsync(GetText("attempting_to_queue", Format.Bold(scvids.Length.ToString()))).ConfigureAwait(false); } catch { }
foreach (var svideo in scvids) foreach (var svideo in scvids)
{ {
try try
{ {
await Task.Yield();
await InternalQueue(mp, await _music.SongInfoFromSVideo(svideo, Context.User.ToString()), true); await InternalQueue(mp, await _music.SongInfoFromSVideo(svideo, Context.User.ToString()), true);
} }
catch { break; } catch (Exception ex)
{
_log.Warn(ex);
break;
}
} }
if (msg != null)
await msg.ModifyAsync(m => m.Content = GetText("playlist_queue_complete")).ConfigureAwait(false);
} }
} }
//todo fix playlist sync stuff
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
public async Task NowPlaying() public async Task NowPlaying()
@ -676,7 +682,7 @@ namespace NadekoBot.Modules.Music
var song = await _music.ResolveSong(path, Context.User.ToString(), MusicType.Local); var song = await _music.ResolveSong(path, Context.User.ToString(), MusicType.Local);
await InternalQueue(mp, song, false).ConfigureAwait(false); await InternalQueue(mp, song, false).ConfigureAwait(false);
} }
//todo test localpl
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[OwnerOnly] [OwnerOnly]
@ -695,6 +701,7 @@ namespace NadekoBot.Modules.Music
{ {
try try
{ {
await Task.Yield();
var song = await _music.ResolveSong(file.FullName, Context.User.ToString(), MusicType.Local); var song = await _music.ResolveSong(file.FullName, Context.User.ToString(), MusicType.Local);
await InternalQueue(mp, song, true).ConfigureAwait(false); await InternalQueue(mp, song, true).ConfigureAwait(false);
} }