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

command/database: support "sort" and "window" in more commands

Browse Source 
Closes https://github.com/MusicPlayerDaemon/MPD/issues/516
This commit is contained in:
Max Kellermann
2019-03-25 18:30:56 +01:00
parent c60d374fc8
commit b1b630a4cc
3 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/command/DatabaseCommands.cxx
View File

@@ -140,55 +140,37 @@ handle_search(Client &client, Request args, Response &r)
}
static CommandResult
handle_match_add(Client &client, Request args, Response &r, bool fold_case)
handle_match_add(Client &client, Request args, bool fold_case)
{
SongFilter filter;
try {
filter.Parse(args, fold_case);
} catch (...) {
r.Error(ACK_ERROR_ARG,
GetFullMessage(std::current_exception()).c_str());
return CommandResult::ERROR;
}
filter.Optimize();
const auto selection = ParseDatabaseSelection(args, fold_case, filter);
auto &partition = client.GetPartition();
const ScopeBulkEdit bulk_edit(partition);
const DatabaseSelection selection("", true, &filter);
AddFromDatabase(partition, selection);
return CommandResult::OK;
}
CommandResult
handle_findadd(Client &client, Request args, Response &r)
handle_findadd(Client &client, Request args, Response &)
{
return handle_match_add(client, args, r, false);
return handle_match_add(client, args, false);
}
CommandResult
handle_searchadd(Client &client, Request args, Response &r)
handle_searchadd(Client &client, Request args, Response &)
{
return handle_match_add(client, args, r, true);
return handle_match_add(client, args, true);
}
CommandResult
handle_searchaddpl(Client &client, Request args, Response &r)
handle_searchaddpl(Client &client, Request args, Response &)
{
const char *playlist = args.shift();
SongFilter filter;
try {
filter.Parse(args, true);
} catch (...) {
r.Error(ACK_ERROR_ARG,
GetFullMessage(std::current_exception()).c_str());
return CommandResult::ERROR;
}
filter.Optimize();
const auto selection = ParseDatabaseSelection(args, true, filter);
const Database &db = client.GetDatabaseOrThrow();
const DatabaseSelection selection("", true, &filter);
search_add_to_playlist(db, client.GetStorage(),
playlist, selection);