Renamed/normalized some music playlist command names.

.lopl will now load files from subdirectories too

src/EllieBot/Modules/Music/Music.cs

@@ -664,7 +664,7 @@ public sealed partial class Music : EllieModule<IMusicService>
 
     [Cmd]
     [RequireContext(ContextType.Guild)]
-    public async Task PlaylistShuffle()
+    public async Task QueueShuffle()
     {
         var valid = await ValidateAsync();
         if (!valid)

src/EllieBot/Modules/Music/PlaylistCommands.cs

@@ -1,5 +1,7 @@
 #nullable disable
+using CommandLine;
 using LinqToDB;
+using Microsoft.EntityFrameworkCore;
 using EllieBot.Modules.Music.Services;
 using EllieBot.Db.Models;
 
@@ -50,17 +52,17 @@ public sealed partial class Music
             }
 
             var embed = CreateEmbed()
-                        .WithAuthor(GetText(strs.playlists_page(num)), MUSIC_ICON_URL)
+                .WithAuthor(GetText(strs.playlists_page(num)), MUSIC_ICON_URL)
-                        .WithDescription(string.Join("\n",
+                .WithDescription(string.Join("\n",
-                            playlists.Select(r => GetText(strs.playlists(r.Id, r.Name, r.Author, r.Songs.Count)))))
+                    playlists.Select(r => GetText(strs.playlists(r.Id, r.Name, r.Author, r.Songs.Count)))))
-                        .WithOkColor();
+                .WithOkColor();
 
             await Response().Embed(embed).SendAsync();
         }
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
-        public async Task DeletePlaylist([Leftover] int id)
+        public async Task PlaylistDelete([Leftover] int id)
         {
             var success = false;
             try
@@ -103,26 +105,26 @@ public sealed partial class Music
             }
 
             await Response()
-                  .Paginated()
+                .Paginated()
-                  .Items(mpl.Songs)
+                .Items(mpl.Songs)
-                  .PageSize(20)
+                .PageSize(20)
-                  .CurrentPage(page)
+                .CurrentPage(page)
-                  .Page((items, _) =>
+                .Page((items, _) =>
-                  {
+                {
-                      var i = 0;
+                    var i = 0;
-                      var str = string.Join("\n",
+                    var str = string.Join("\n",
-                          items
+                        items
-                              .Select(x => $"`{++i}.` [{x.Title.TrimTo(45)}]({x.Query}) `{x.Provider}`"));
+                            .Select(x => $"`{++i}.` [{x.Title.TrimTo(45)}]({x.Query}) `{x.Provider}`"));
-                      return CreateEmbed().WithTitle($"\"{mpl.Name}\" by {mpl.Author}")
+                    return CreateEmbed().WithTitle($"\"{mpl.Name}\" by {mpl.Author}")
-                                               .WithOkColor()
+                        .WithOkColor()
-                                               .WithDescription(str);
+                        .WithDescription(str);
-                  })
+                })
-                  .SendAsync();
+                .SendAsync();
         }
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
-        public async Task Save([Leftover] string name)
+        public async Task PlaylistSave([Leftover] string name)
         {
             if (!_service.TryGetMusicPlayer(ctx.Guild.Id, out var mp))
             {
@@ -131,14 +133,14 @@ public sealed partial class Music
             }
 
             var songs = mp.GetQueuedTracks()
-                          .Select(s => new PlaylistSong
+                .Select(s => new PlaylistSong
-                          {
+                {
-                              Provider = s.Platform.ToString(),
+                    Provider = s.Platform.ToString(),
-                              ProviderType = (MusicType)s.Platform,
+                    ProviderType = (MusicType)s.Platform,
-                              Title = s.Title,
+                    Title = s.Title,
-                              Query = s.Url
+                    Query = s.Url
-                          })
+                })
-                          .ToList();
+                .ToList();
 
             MusicPlaylist playlist;
             await using (var uow = _db.GetDbContext())
@@ -155,18 +157,30 @@ public sealed partial class Music
             }
 
             await Response()
-                  .Embed(CreateEmbed()
+                .Embed(CreateEmbed()
-                         .WithOkColor()
+                    .WithOkColor()
-                         .WithTitle(GetText(strs.playlist_saved))
+                    .WithTitle(GetText(strs.playlist_saved))
-                         .AddField(GetText(strs.name), name)
+                    .AddField(GetText(strs.name), name)
-                         .AddField(GetText(strs.id), playlist.Id.ToString()))
+                    .AddField(GetText(strs.id), playlist.Id.ToString()))
-                  .SendAsync();
+                .SendAsync();
+        }
+
+        public class PlaylistLoadOptions : IEllieCommandOptions
+        {
+            [Option("shuffle")]
+            public bool Shuffled { get; set; } = false;
+
+            public void NormalizeOptions()
+            {
+            }
         }
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
-        public async Task Load([Leftover] int id)
+        [EllieOptions<PlaylistLoadOptions>]
+        public async Task PlaylistLoad(int id, params string[] args)
         {
+            var opts = OptionsParser.ParseFrom(new PlaylistLoadOptions(), args).Item1;
             // expensive action, 1 at a time
             await _playlistLock.WaitAsync();
             try
@@ -201,7 +215,9 @@ public sealed partial class Music
                 MusicPlaylist mpl;
                 await using (var uow = _db.GetDbContext())
                 {
-                    mpl = uow.Set<MusicPlaylist>().GetWithSongs(id);
+                    mpl = uow.Set<MusicPlaylist>()
+                        .AsNoTracking()
+                        .GetWithSongs(id);
                 }
 
                 if (mpl is null)
@@ -214,14 +230,19 @@ public sealed partial class Music
                 try
                 {
                     msg = await Response()
-                                .Pending(strs.attempting_to_queue(Format.Bold(mpl.Songs.Count.ToString())))
+                        .Pending(strs.attempting_to_queue(Format.Bold(mpl.Songs.Count.ToString())))
-                                .SendAsync();
+                        .SendAsync();
                 }
                 catch (Exception)
                 {
                 }
 
-                await mp.EnqueueManyAsync(mpl.Songs.Select(x => (x.Query, (MusicPlatform)x.ProviderType)),
+                var songs = opts.Shuffled
+                    ? mpl.Songs.Shuffle()
+                    : mpl.Songs;
+
+                await mp.EnqueueManyAsync(
+                    songs.Select(x => (x.Query, (MusicPlatform)x.ProviderType)),
                     ctx.User.ToString());
 
                 if (msg is not null)

src/EllieBot/Modules/Music/_common/Resolvers/LocalTrackResolver.cs

@@ -39,7 +39,7 @@ public sealed class LocalTrackResolver : ILocalTrackResolver
             yield break;
         }
 
-        var files = dir.EnumerateFiles()
+        var files = dir.EnumerateFiles("*", SearchOption.AllDirectories)
                        .Where(x =>
                        {
                            if (!x.Attributes.HasFlag(FileAttributes.Hidden | FileAttributes.System)

src/EllieBot/Modules/Music/_common/db/MusicPlaylistExtensions.cs

@@ -13,6 +13,6 @@ public static class MusicPlaylistExtensions
         return playlists.AsQueryable().Skip((num - 1) * 20).Take(20).Include(pl => pl.Songs).ToList();
     }
 
-    public static MusicPlaylist GetWithSongs(this DbSet<MusicPlaylist> playlists, int id)
+    public static MusicPlaylist GetWithSongs(this IQueryable<MusicPlaylist> playlists, int id)
         => playlists.Include(mpl => mpl.Songs).FirstOrDefault(mpl => mpl.Id == id);
 }

src/EllieBot/strings/aliases.yml

@@ -423,11 +423,6 @@ draw:
   - draw
 drawnew:
   - drawnew
-playlistshuffle:
-  - playlistshuffle
-  - shuffle
-  - sh
-  - plsh
 flip:
   - flip
 betflip:
@@ -528,6 +523,11 @@ queuesearch:
   - queuesearch
   - qs
   - yqs
+queueshuffle:
+  - queueshuffle
+  - qsh
+  - qshuffle
+  - shuffle
 listqueue:
   - listqueue
   - lq
@@ -538,9 +538,14 @@ volume:
   - volume
   - vol
   - defvol
-playlist:
+playlistload:
-  - playlist
+  - playlistload
-  - pl
+  - pload
+  - plload
+  - pll
+playlists:
+  - playlists
+  - pls
 localplaylist:
   - localplaylist
   - lopl
@@ -550,6 +555,9 @@ radio:
 local:
   - local
   - lo
+playlist:
+  - playlist
+  - pl
 join:
   - join
   - j
@@ -574,21 +582,20 @@ queueautoplay:
   - qap
 queuefairplay:
   - qfp
-save:
+playlistsave:
-  - save
+  - playlistsave
+  - plsave
+  - psave
 streamrole:
   - streamrole
-load:
-  - load
-playlists:
-  - playlists
-  - pls
 playlistshow:
   - playlistshow
   - plshow
-deleteplaylist:
+playlistdelete:
-  - deleteplaylist
+  - playlistdelete
-  - delpls
+  - pldel
+  - plrm
+  - pldelete
 streamadd:
   - streamadd
   - sta
@@ -877,7 +884,7 @@ betstats:
   - bs
 gamblestats:
   - gamblestats
-  - gs 
+  - gs
 bettest:
   - bettest
 slot:
@@ -889,7 +896,7 @@ affinity:
 waifuclaim:
   - waifuclaim
   - claim
-    - wc
+  - wc
 waifuclaims:
   - waifuclaims
   - claims
@@ -1353,7 +1360,7 @@ marmaladeinfo:
   - mainfo
 marmaladesearch:
   - marmaladesearch
-  - masearchW
+  - masearch
 # Bank stuff
 bankdeposit:
   - deposit
@@ -1512,7 +1519,7 @@ btnroleremove:
   - r
   - rm
 btnroleremoveall:
-  - remall
+  - removeall
   - rma
 btnrolelist:
   - list
@@ -1573,7 +1580,7 @@ fishlist:
   - fil
   - fishlist
 fishspot:
-  - fishspot 
+  - fishspot
   - fisp
   - fish?
 xprate:

src/EllieBot/strings/commands/commands.en-US.yml

@@ -1383,12 +1383,6 @@ drawnew:
   params:
     - num:
         desc: "The number of cards to be drawn from the new deck."
-playlistshuffle:
-  desc: Shuffles the current playlist.
-  ex:
-    - ''
-  params:
-    - { }
 flip:
   desc: Flips coin(s) - heads or tails, and shows an image.
   ex:
@@ -1701,6 +1695,12 @@ play:
         desc: "The index of the desired song or search result to navigate to."
     - query:
         desc: "The search query is used to find and play songs matching the specified criteria."
+queueshuffle:
+  desc: Shuffles the current playlist.
+  ex:
+    - ''
+  params:
+    - { }
 stop:
   desc: Stops the music and preserves the current song index. Stays in the channel.
   ex:
@@ -1832,13 +1832,6 @@ queuerepeat:
   params:
     - type:
         desc: "The type of repeat strategy to be set."
-save:
-  desc: Saves a playlist under a certain name. Playlist name must be no longer than 20 characters and must not contain dashes.
-  ex:
-    - classical1
-  params:
-    - name:
-        desc: "The name provided is used to uniquely identify the saved playlist."
 streamrole:
   desc: Sets a role which is monitored for streamers (FromRole), and a role to add if a user from 'FromRole' is streaming (AddRole). When a user from 'FromRole' starts streaming, they will receive an 'AddRole'. You can only have 1 Stream Role per server. Provide no parameters to disable
   ex:
@@ -1849,13 +1842,20 @@ streamrole:
       addRole:
         desc: "The role to be added to users when they start streaming."
     - { }
-load:
+playlistload:
   desc: Loads a saved playlist using its ID. Use `{0}pls` to list all saved playlists and `{0}save` to save new ones.
   ex:
     - 5
   params:
     - id:
         desc: "The id of the playlist to be loaded."
+playlistsave:
+  desc: Saves a playlist under a certain name. Playlist name must be no longer than 20 characters and must not contain dashes.
+  ex:
+    - classical1
+  params:
+    - name:
+        desc: "The name provided is used to uniquely identify the saved playlist."
 playlists:
   desc: Lists all playlists. Paginated, 20 per page.
   ex:
@@ -1872,8 +1872,8 @@ playlistshow:
         desc: "The id of the playlist to retrieve songs from."
       page:
         desc: "The current page number for the pagination."
-deleteplaylist:
+playlistdelete:
-  desc: Deletes a saved playlist using its id. Works only if you made it or if you are the bot owner.
+  desc: Deletes a saved playlist using its ID. Works only on playlists saved by you.
   ex:
     - 5
   params: