From 67a6b690887aeb92b2c61bc592349959eab57151 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 27 Dec 2016 01:35:46 +0100 Subject: [PATCH] Cleaned up PR --- src/NadekoBot/Modules/Music/Classes/Song.cs | 51 ++++++------------- src/NadekoBot/Modules/Music/Music.cs | 56 ++++++++++----------- 2 files changed, 44 insertions(+), 63 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/Song.cs b/src/NadekoBot/Modules/Music/Classes/Song.cs index cd3e47a3..b6b860e9 100644 --- a/src/NadekoBot/Modules/Music/Classes/Song.cs +++ b/src/NadekoBot/Modules/Music/Classes/Song.cs @@ -47,25 +47,7 @@ namespace NadekoBot.Modules.Music.Classes public string PrettyFullTime => PrettyCurrentTime + " / " + PrettyTotalTime; - //public string PrettyName => $"**[{SongInfo.Title.TrimTo(70)}]({SongInfo.Query})**"; - - public string PrettyName { - get { - switch (SongInfo.ProviderType) - { - case MusicType.Normal: - return $"**[{SongInfo.Title.TrimTo(70)}]({SongInfo.Query})**"; - case MusicType.Soundcloud: - return $"**[{SongInfo.Title.TrimTo(70)}]({SongInfo.Query})**"; - case MusicType.Local: - return $"**{SongInfo.Title.TrimTo(70)}**"; - case MusicType.Radio: - return $"**{SongInfo.Title.TrimTo(70)}**"; - default: - return ""; - } - } - } + public string PrettyName => $"**[{SongInfo.Title.TrimTo(65)}]({songUrl})**"; public string PrettyInfo => $"{PrettyTotalTime} | {PrettyProvider} | {QueuerName}"; @@ -86,36 +68,35 @@ namespace NadekoBot.Modules.Music.Classes public string Thumbnail { get { - switch (SongInfo.Provider) + switch (SongInfo.ProviderType) { - case "YouTube": + case MusicType.Radio: //todo have videoid in songinfo from the start var videoId = Regex.Match(SongInfo.Query, "<=v=[a-zA-Z0-9-]+(?=&)|(?<=[0-9])[^&\n]+|(?<=v=)[^&\n]+"); return $"https://img.youtube.com/vi/{ videoId }/0.jpg"; - case "SoundCloud": - return SongInfo.AlbumArt; - case "Local File": - return $"https://cdn.discordapp.com/attachments/155726317222887425/261850914783100928/1482522077_music.png"; //test links - case "Radio Stream": - return $"https://cdn.discordapp.com/attachments/155726317222887425/261850925063340032/1482522097_radio.png"; //test links - default: - return ""; + case MusicType.Normal: + return $"https://cdn.discordapp.com/attachments/155726317222887425/261850925063340032/1482522097_radio.png"; //test links + case MusicType.Local: + return $"https://cdn.discordapp.com/attachments/155726317222887425/261850914783100928/1482522077_music.png"; //test links + case MusicType.Soundcloud: + return SongInfo.AlbumArt; } + return ""; } } - - public string songURL { + + private string songUrl { get { switch (SongInfo.ProviderType) { case MusicType.Normal: return SongInfo.Query; case MusicType.Soundcloud: - return SongInfo.Query; + return SongInfo.Query; case MusicType.Local: - return $"https://google.com/search?q={ WebUtility.UrlEncode(SongInfo.Title).Replace(' ', '+') }"; + return $"https://google.com/search?q={ WebUtility.UrlEncode(SongInfo.Title).Replace(' ', '+') }"; case MusicType.Radio: - return $"https://google.com/search?q={SongInfo.Title}"; + return $"https://google.com/search?q={SongInfo.Title}"; default: return ""; } @@ -143,7 +124,7 @@ namespace NadekoBot.Modules.Music.Classes { var s = new Song(SongInfo); s.MusicPlayer = MusicPlayer; - s.QueuerName = QueuerName; + s.QueuerName = QueuerName; return s; } diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index d68fd191..f856c4f3 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -240,7 +240,7 @@ namespace NadekoBot.Modules.Music .WithFooter(ef => ef.WithText($"{currentSong.PrettyProvider} | {currentSong.QueuerName}")) .WithOkColor() .WithThumbnail(tn => tn.Url = currentSong.Thumbnail) - .WithUrl(currentSong.songURL); + .WithUrl(currentSong.SongUrl); await channel.EmbedAsync(embed.Build()).ConfigureAwait(false); } @@ -327,28 +327,28 @@ namespace NadekoBot.Modules.Music var count = ids.Count(); var msg = await channel.SendMessageAsync($"🎵 Attempting to queue **{count}** songs".SnPl(count) + "...").ConfigureAwait(false); - - var cancelSource = new CancellationTokenSource(); + + var cancelSource = new CancellationTokenSource(); var gusr = (IGuildUser)umsg.Author; - - while (ids.Any() && !cancelSource.IsCancellationRequested) + + while (ids.Any() && !cancelSource.IsCancellationRequested) { var tasks = Task.WhenAll(ids.Take(5).Select(async id => { if (cancelSource.Token.IsCancellationRequested) - return; - try - { - await QueueSong(gusr, channel, gusr.VoiceChannel, id, true).ConfigureAwait(false); - } - catch (SongNotFoundException) { } - catch { try { cancelSource.Cancel(); } catch { } } - })); + return; + try + { + await QueueSong(gusr, channel, gusr.VoiceChannel, id, true).ConfigureAwait(false); + } + catch (SongNotFoundException) { } + catch { try { cancelSource.Cancel(); } catch { } } + })); - await Task.WhenAny(tasks, Task.Delay(Timeout.Infinite, cancelSource.Token)); - ids = ids.Skip(5); - } + await Task.WhenAny(tasks, Task.Delay(Timeout.Infinite, cancelSource.Token)); + ids = ids.Skip(5); + } await msg.ModifyAsync(m => m.Content = "✅ Playlist queue complete.").ConfigureAwait(false); } @@ -404,7 +404,7 @@ namespace NadekoBot.Modules.Music var dir = new DirectoryInfo(arg); var fileEnum = dir.GetFiles("*", SearchOption.AllDirectories) .Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden | FileAttributes.System)); - var gusr = (IGuildUser)umsg.Author; + var gusr = (IGuildUser)umsg.Author; foreach (var file in fileEnum) { try @@ -488,7 +488,7 @@ namespace NadekoBot.Modules.Music .AddField(fb => fb.WithName("**Song Position**").WithValue($"#{num}").WithIsInline(true)) .AddField(fb => fb.WithName("**Song Name**").WithValue(song.PrettyName).WithIsInline(true)) .WithFooter(ef => ef.WithText($"{song.PrettyProvider} | {song.QueuerName}")) - .WithErrorColor(); + .WithErrorColor(); await channel.EmbedAsync(embed.Build()).ConfigureAwait(false); } @@ -546,7 +546,7 @@ namespace NadekoBot.Modules.Music .WithAuthor(eab => eab.WithName("Song Moved").WithMusicIcon()) .AddField(fb => fb.WithName("**From Position**").WithValue($"#{n1}").WithIsInline(true)) .AddField(fb => fb.WithName("**To Position**").WithValue($"#{n2}").WithIsInline(true)) - .WithFooter(ef => ef.WithText($"{s.PrettyProvider} | {s.QueuerName}")) + .WithFooter(ef => ef.WithText($"{s.PrettyProvider} | {s.QueuerName}")) .WithOkColor(); await channel.EmbedAsync(embed.Build()).ConfigureAwait(false); } @@ -583,7 +583,7 @@ namespace NadekoBot.Modules.Music .WithOkColor() .WithAuthor(eab => eab.WithMusicIcon().WithName("🔂 Repeating track")) .WithDescription(currentSong.PrettyName) - .WithFooter(ef => ef.WithText(currentSong.PrettyInfo)) + .WithFooter(ef => ef.WithText(currentSong.PrettyInfo)) .Build()).ConfigureAwait(false); else await channel.SendConfirmAsync($"🔂 Current track repeat stopped.") @@ -658,9 +658,9 @@ namespace NadekoBot.Modules.Music } IUserMessage msg = null; try { msg = await channel.SendMessageAsync($"🎶 Attempting to load **{mpl.Songs.Count}** songs...").ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } - - var usr = (IGuildUser)umsg.Author; - foreach (var item in mpl.Songs) + + var usr = (IGuildUser)umsg.Author; + foreach (var item in mpl.Songs) { try { @@ -815,7 +815,7 @@ namespace NadekoBot.Modules.Music { if (finishedMessage != null) finishedMessage.DeleteAfter(0); - + finishedMessage = await textCh.EmbedAsync(new EmbedBuilder().WithOkColor() .WithAuthor(eab => eab.WithName("Finished Song").WithMusicIcon()) .WithDescription(song.PrettyName) @@ -831,13 +831,13 @@ namespace NadekoBot.Modules.Music catch { } }; IUserMessage playingMessage = null; - + mp.OnStarted += async (player, song) => { try { await mp.UpdateSongDurationsAsync().ConfigureAwait(false); } catch { } var sender = player as MusicPlayer; if (sender == null) - return; + return; try { if (playingMessage != null) @@ -846,7 +846,7 @@ namespace NadekoBot.Modules.Music playingMessage = await textCh.EmbedAsync(new EmbedBuilder().WithOkColor() .WithAuthor(eab => eab.WithName("Playing Song").WithMusicIcon()) .WithDescription(song.PrettyName) - .WithFooter(ef => ef.WithText($"🔉 {(int)(sender.Volume * 100)}% | {song.PrettyInfo}")) + .WithFooter(ef => ef.WithText($"🔉 {(int)(sender.Volume * 100)}% | {song.PrettyInfo}")) .Build()) .ConfigureAwait(false); } @@ -897,7 +897,7 @@ namespace NadekoBot.Modules.Music var queuedMessage = await textCh.EmbedAsync(new EmbedBuilder().WithOkColor() .WithAuthor(eab => eab.WithName("Queued Song").WithMusicIcon()) .WithDescription($"{resolvedSong.PrettyName}\nQueue #{musicPlayer.Playlist.Count + 1}") - .WithThumbnail(tn => tn.Url = resolvedSong.Thumbnail) + .WithThumbnail(tn => tn.Url = resolvedSong.Thumbnail) .WithFooter(ef => ef.WithText(resolvedSong.PrettyProvider)) .Build()) .ConfigureAwait(false);