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

command/queue: better error message for open-ended range with "move"

Browse Source 
The "move" command doesn't allow open-ended ranges because they don't
make a lot of sense; moving an open-ended range is only possible if
the destination index is before the range, and in that case, the
client should be well aware how many songs there are.

Closes https://github.com/MusicPlayerDaemon/MPD/pull/1057
This commit is contained in:
Max Kellermann 2021-02-15 20:51:12 +01:00
parent a6c10e9a1c
commit 6b1d264b35
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,6 +1,7 @@
ver 0.22.5 (not yet released) ver 0.22.5 (not yet released)
* protocol * protocol
- error for malformed ranges instead of ignoring silently - error for malformed ranges instead of ignoring silently
- better error message for open-ended range with "move"
* database * database
- simple: fix missing CUE sheet metadata in "addid" command - simple: fix missing CUE sheet metadata in "addid" command
* tags * tags

5
src/command/QueueCommands.cxx
View File

@ -326,6 +326,11 @@ CommandResult
handle_move(Client &client, Request args, [[maybe_unused]] Response &r) handle_move(Client &client, Request args, [[maybe_unused]] Response &r)
{ {
RangeArg range = args.ParseRange(0); RangeArg range = args.ParseRange(0);
if (range.IsOpenEnded()) {
r.Error(ACK_ERROR_ARG, "Open-ended range not supported");
return CommandResult::ERROR;
}
int to = args.ParseInt(1); int to = args.ParseInt(1);
client.GetPartition().MoveRange(range.start, range.end, to); client.GetPartition().MoveRange(range.start, range.end, to);
return CommandResult::OK; return CommandResult::OK;