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

Added "searchcount" command, a case-insensitive "count"

Browse Source 
The `count` command isn't case-insensitive.  This adds `searchcount`
which is a case-insensitive version of `count`.
This commit is contained in:
Mike Bremford
2022-12-13 15:57:49 +00:00
committed by Max Kellermann
parent 8b1ff3f005
commit 6adff85fd6
5 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/command/AllCommands.cxx
View File

@@ -189,6 +189,7 @@ static constexpr struct command commands[] = {
{ "search", PERMISSION_READ, 1, -1, handle_search },
{ "searchadd", PERMISSION_ADD, 1, -1, handle_searchadd },
{ "searchaddpl", PERMISSION_CONTROL, 2, -1, handle_searchaddpl },
{ "searchcount", PERMISSION_READ, 1, -1, handle_searchcount },
#endif
{ "seek", PERMISSION_PLAYER, 2, 2, handle_seek },
{ "seekcur", PERMISSION_PLAYER, 1, 1, handle_seekcur },

18
src/command/DatabaseCommands.cxx
View File

@@ -231,8 +231,8 @@ handle_searchaddpl(Client &client, Request args, Response &)
return CommandResult::OK;
}
CommandResult
handle_count(Client &client, Request args, Response &r)
static CommandResult
handle_count_internal(Client &client, Request args, Response &r, bool fold_case)
{
TagType group = TAG_NUM_OF_ITEM_TYPES;
if (args.size() >= 2 && StringIsEqual(args[args.size() - 2], "group")) {
@@ -251,7 +251,7 @@ handle_count(Client &client, Request args, Response &r)
SongFilter filter;
if (!args.empty()) {
try {
filter.Parse(args, false);
filter.Parse(args, fold_case);
} catch (...) {
r.Error(ACK_ERROR_ARG,
GetFullMessage(std::current_exception()).c_str());
@@ -265,6 +265,18 @@ handle_count(Client &client, Request args, Response &r)
return CommandResult::OK;
}
CommandResult
handle_count(Client &client, Request args, Response &r)
{
return handle_count_internal(client, args, r, false);
}
CommandResult
handle_searchcount(Client &client, Request args, Response &r)
{
return handle_count_internal(client, args, r, true);
}
CommandResult
handle_listall(Client &client, Request args, Response &r)
{

3
src/command/DatabaseCommands.hxx
View File

@@ -47,6 +47,9 @@ handle_searchadd(Client &client, Request request, Response &response);
CommandResult
handle_searchaddpl(Client &client, Request request, Response &response);
CommandResult
handle_searchcount(Client &client, Request request, Response &response);
CommandResult
handle_count(Client &client, Request request, Response &response);