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

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

command/queue: better error message for open-ended range with "move"
6b1d264b · Max Kellermann · a6c10e9a · 6b1d264b · 6b1d264b
Commit 6b1d264b authored Feb 15, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

NEWS NEWS +1 -0

QueueCommands.cxx src/command/QueueCommands.cxx +5 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.22.5 (not yet released)
 * protocol
  - error for malformed ranges instead of ignoring silently
+  - better error message for open-ended range with "move"
 * database
  - simple: fix missing CUE sheet metadata in "addid" command
 * tags

--- a/src/command/QueueCommands.cxx
+++ b/src/command/QueueCommands.cxx
@@ -326,6 +326,11 @@ CommandResult
 handle_move(Client &client, Request args, [[maybe_unused]] Response &r)
 {
 	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);
 	client.GetPartition().MoveRange(range.start, range.end, to);
 	return CommandResult::OK;