command/QueueCommands: support relative offsets in "addid"

NEWS

@@ -3,6 +3,7 @@ ver 0.23 (not yet released)
   - new command "getvol"
   - show the audio format in "playlistinfo"
   - support "listfiles" with arbitrary storage plugins
+  - support relative positions in "addid"
 * database
   - proxy: require MPD 0.20 or later
   - proxy: require libmpdclient 2.11 or later

doc/protocol.rst

@@ -709,6 +709,12 @@ Whenever possible, ids should be used.
      Id: 999
      OK
 
+    If the second parameter is given, then the song is inserted at the
+    specified position.  If the parameter starts with ``+`` or ``-``,
+    then it is relative to the current song; e.g. ``+1`` inserts right
+    after the current song and ``-1`` inserts right before the current
+    song.  (``±0`` is not a legal value.)
+
 .. _command_clear:
 
 :command:`clear`

src/command/QueueCommands.cxx

@@ -115,8 +115,39 @@ handle_addid(Client &client, Request args, Response &r)
 	auto &partition = client.GetPartition();
 
 	int to = -1;
+
 	if (args.size > 1) {
 		const auto queue_length = partition.playlist.queue.GetLength();
+
+		const char *const s = args[1];
+		if (*s == '+' || *s == '-') {
+			/* relative to the current song */
+
+			const int current =
+				partition.playlist.GetCurrentPosition();
+			if (current < 0)
+				throw ProtocolError(ACK_ERROR_PLAYER_SYNC,
+						    "No current song");
+
+			to = args.ParseInt(1, -current - 1,
+					   queue_length - current);
+			if (to == 0)
+				throw ProtocolError(ACK_ERROR_ARG,
+						    "Zero is not a legal relative position");
+
+			/* special case for negative offsets: the
+			   offset "-1" shall insert the new song right
+			   before the current song (just like "+1"
+			   inserts right after the current song);
+			   computationally, that would be a zero
+			   offset, but that's not intuitive, so we
+			   need to add one here */
+			if (to < 0)
+				++to;
+
+			to += current;
+		} else
+			/* absolute position */
 			to = args.ParseUnsigned(1, queue_length);
 	}