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

command/database: support relative offsets for "searchadd"

Browse Source 
Closes https://github.com/MusicPlayerDaemon/MPD/issues/1337
This commit is contained in:
Max Kellermann
2021-11-23 12:03:20 +01:00
parent fd5b195879
commit 4682ae0898
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/command/DatabaseCommands.cxx
View File

@@ -18,6 +18,7 @@
*/
#include "DatabaseCommands.hxx"
#include "PositionArg.hxx"
#include "Request.hxx"
#include "Partition.hxx"
#include "db/DatabaseQueue.hxx"
@@ -86,6 +87,20 @@ ParseQueuePosition(Request &args, unsigned queue_length)
return queue_length;
}
static unsigned
ParseInsertPosition(Request &args, const playlist &playlist)
{
if (args.size >= 2 && StringIsEqual(args[args.size - 2], "position")) {
unsigned position = ParseInsertPosition(args.back(), playlist);
args.pop_back();
args.pop_back();
return position;
}
/* append to the end of the queue by default */
return playlist.queue.GetLength();
}
/**
* Convert all remaining arguments to a #DatabaseSelection.
*
@@ -160,7 +175,8 @@ handle_match_add(Client &client, Request args, bool fold_case)
{
auto &partition = client.GetPartition();
const auto queue_length = partition.playlist.queue.GetLength();
const unsigned position = ParseQueuePosition(args, queue_length);
const unsigned position =
ParseInsertPosition(args, partition.playlist);
SongFilter filter;
const auto selection = ParseDatabaseSelection(args, fold_case, filter);