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

DatabaseCommands: simplify the handle_list() argument parser

This commit is contained in:
Max Kellermann 2014-04-24 11:38:27 +02:00
parent 27002ad1ea
commit 7fdd801479
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/command/DatabaseCommands.cxx
View File

@ -179,16 +179,20 @@ handle_listall(Client &client, gcc_unused int argc, char *argv[])
CommandResult CommandResult
handle_list(Client &client, int argc, char *argv[]) handle_list(Client &client, int argc, char *argv[])
{ {
unsigned tagType = locate_parse_type(argv[1]); ConstBuffer<const char *> args(argv + 1, argc - 1);
const char *tag_name = args.shift();
unsigned tagType = locate_parse_type(tag_name);
if (tagType >= TAG_NUM_OF_ITEM_TYPES && if (tagType >= TAG_NUM_OF_ITEM_TYPES &&
tagType != LOCATE_TAG_FILE_TYPE) { tagType != LOCATE_TAG_FILE_TYPE) {
command_error(client, ACK_ERROR_ARG, "\"%s\" is not known", argv[1]); command_error(client, ACK_ERROR_ARG,
"Unknown tag type: %s", tag_name);
return CommandResult::ERROR; return CommandResult::ERROR;
} }
SongFilter *filter; SongFilter *filter = nullptr;
if (argc == 3) {
if (args.size == 1) {
/* for compatibility with < 0.12.0 */ /* for compatibility with < 0.12.0 */
if (tagType != TAG_ALBUM) { if (tagType != TAG_ALBUM) {
command_error(client, ACK_ERROR_ARG, command_error(client, ACK_ERROR_ARG,
@ -197,10 +201,10 @@ handle_list(Client &client, int argc, char *argv[])
return CommandResult::ERROR; return CommandResult::ERROR;
} }
filter = new SongFilter((unsigned)TAG_ARTIST, argv[2]); filter = new SongFilter((unsigned)TAG_ARTIST, args.shift());
} else if (argc > 2) { }
ConstBuffer<const char *> args(argv + 2, argc - 2);
if (!args.IsEmpty()) {
filter = new SongFilter(); filter = new SongFilter();
if (!filter->Parse(args, false)) { if (!filter->Parse(args, false)) {
delete filter; delete filter;
@ -208,8 +212,7 @@ handle_list(Client &client, int argc, char *argv[])
"not able to parse args"); "not able to parse args");
return CommandResult::ERROR; return CommandResult::ERROR;
} }
} else }
filter = nullptr;
Error error; Error error;
CommandResult ret = CommandResult ret =