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

command/Database: don't use locate_parse_type()

Browse Source
This commit is contained in:
Max Kellermann 2018-07-25 11:29:14 +02:00
parent 91af2ebc2a
commit 42ec67168a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/command/DatabaseCommands.cxx
View File

@ -33,6 +33,7 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/Exception.hxx" #include "util/Exception.hxx"
#include "util/StringAPI.hxx" #include "util/StringAPI.hxx"
#include "util/ASCII.hxx"
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "BulkEdit.hxx" #include "BulkEdit.hxx"
@ -247,12 +248,12 @@ CommandResult
handle_list(Client &client, Request args, Response &r) handle_list(Client &client, Request args, Response &r)
{ {
const char *tag_name = args.shift(); const char *tag_name = args.shift();
unsigned tagType = locate_parse_type(tag_name); if (StringEqualsCaseASCII(tag_name, "file") ||
StringEqualsCaseASCII(tag_name, "filename"))
if (tagType == LOCATE_TAG_FILE_TYPE)
return handle_list_file(client, args, r); return handle_list_file(client, args, r);
if (tagType >= TAG_NUM_OF_ITEM_TYPES) { const auto tagType = tag_name_parse_i(tag_name);
if (tagType == TAG_NUM_OF_ITEM_TYPES) {
r.FormatError(ACK_ERROR_ARG, r.FormatError(ACK_ERROR_ARG,
"Unknown tag type: %s", tag_name); "Unknown tag type: %s", tag_name);
return CommandResult::ERROR; return CommandResult::ERROR;
@ -301,14 +302,13 @@ handle_list(Client &client, Request args, Response &r)
} }
} }
if (tagType < TAG_NUM_OF_ITEM_TYPES && if (group_mask.Test(tagType)) {
group_mask.Test(TagType(tagType))) {
r.Error(ACK_ERROR_ARG, "Conflicting group"); r.Error(ACK_ERROR_ARG, "Conflicting group");
return CommandResult::ERROR; return CommandResult::ERROR;
} }
PrintUniqueTags(r, client.GetPartition(), PrintUniqueTags(r, client.GetPartition(),
TagType(tagType), group_mask, filter.get()); tagType, group_mask, filter.get());
return CommandResult::OK; return CommandResult::OK;
} }