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

command/Database: move code to handle_list_file()

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

33
src/command/DatabaseCommands.cxx
View File

@ -223,14 +223,36 @@ handle_listall(Client &client, Request args, Response &r)
return CommandResult::OK; return CommandResult::OK;
} }
static CommandResult
handle_list_file(Client &client, Request args, Response &r)
{
std::unique_ptr<SongFilter> filter;
if (!args.empty()) {
filter.reset(new SongFilter());
try {
filter->Parse(args, false);
} catch (...) {
r.Error(ACK_ERROR_ARG,
GetFullMessage(std::current_exception()).c_str());
return CommandResult::ERROR;
}
}
PrintSongUris(r, client.GetPartition(), filter.get());
return CommandResult::OK;
}
CommandResult 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); unsigned tagType = locate_parse_type(tag_name);
if (tagType >= TAG_NUM_OF_ITEM_TYPES && if (tagType == LOCATE_TAG_FILE_TYPE)
tagType != LOCATE_TAG_FILE_TYPE) { return handle_list_file(client, args, r);
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;
@ -285,11 +307,8 @@ handle_list(Client &client, Request args, Response &r)
return CommandResult::ERROR; return CommandResult::ERROR;
} }
if (tagType == LOCATE_TAG_FILE_TYPE) PrintUniqueTags(r, client.GetPartition(),
PrintSongUris(r, client.GetPartition(), filter.get()); TagType(tagType), group_mask, filter.get());
else
PrintUniqueTags(r, client.GetPartition(),
TagType(tagType), group_mask, filter.get());
return CommandResult::OK; return CommandResult::OK;
} }