oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'searchplaylist_syntax' of https://github.com/jcorporation/MPD

This commit is contained in:
Max Kellermann 2024-09-27 08:47:02 +02:00
parent 9ff8e02e54 3f718e8924
commit def2221dfd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/protocol.rst
View File

@ -996,7 +996,7 @@ remote playlists (absolute URI with a supported scheme).
.. _command_searchplaylist: .. _command_searchplaylist:
:command:`searchplaylist {NAME} {FILTER} [{START:END}]` :command:`searchplaylist {NAME} {FILTER} [window {START:END}]`
Search the playlist for songs matching Search the playlist for songs matching
``FILTER`` (see :ref:`Filters <filter_syntax>`). Playlist ``FILTER`` (see :ref:`Filters <filter_syntax>`). Playlist
plugins are supported. A range may be specified to list plugins are supported. A range may be specified to list

2
src/command/AllCommands.cxx
View File

@ -176,7 +176,7 @@ static constexpr struct command commands[] = {
{ "searchaddpl", PERMISSION_CONTROL, 2, -1, handle_searchaddpl }, { "searchaddpl", PERMISSION_CONTROL, 2, -1, handle_searchaddpl },
{ "searchcount", PERMISSION_READ, 1, -1, handle_searchcount }, { "searchcount", PERMISSION_READ, 1, -1, handle_searchcount },
#endif #endif
{ "searchplaylist", PERMISSION_READ, 2, 3, handle_searchplaylist }, { "searchplaylist", PERMISSION_READ, 2, 4, handle_searchplaylist },
{ "seek", PERMISSION_PLAYER, 2, 2, handle_seek }, { "seek", PERMISSION_PLAYER, 2, 2, handle_seek },
{ "seekcur", PERMISSION_PLAYER, 1, 1, handle_seekcur }, { "seekcur", PERMISSION_PLAYER, 1, 1, handle_seekcur },
{ "seekid", PERMISSION_PLAYER, 2, 2, handle_seekid }, { "seekid", PERMISSION_PLAYER, 2, 2, handle_seekid },

4
src/command/PlaylistCommands.cxx
View File

@ -164,8 +164,10 @@ handle_searchplaylist(Client &client, Request args, Response &r)
args.shift(); args.shift();
RangeArg window = RangeArg::All(); RangeArg window = RangeArg::All();
if (args.size() == 2) { if (args.size() == 3 && StringIsEqual(args[args.size() - 2], "window")) {
window = args.ParseRange(args.size() - 1); window = args.ParseRange(args.size() - 1);
args.pop_back();
args.pop_back(); args.pop_back();
} }