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

protocol/ArgParser: add struct RangeArg

Browse Source
This commit is contained in:
Max Kellermann
2015-08-11 21:35:52 +02:00
parent 993df0fd28
commit cbdc3194cc
6 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/DatabaseCommands.cxx
View File

@@ -67,15 +67,15 @@ handle_lsinfo2(Client &client, ConstBuffer<const char *> args)
static CommandResult
handle_match(Client &client, ConstBuffer<const char *> args, bool fold_case)
{
unsigned window_start = 0, window_end = std::numeric_limits<int>::max();
RangeArg window;
if (args.size >= 2 && strcmp(args[args.size - 2], "window") == 0) {
if (!check_range(client, &window_start, &window_end,
args.back()))
if (!ParseCommandArg(client, window, args.back()))
return CommandResult::ERROR;
args.pop_back();
args.pop_back();
}
} else
window.SetAll();
SongFilter filter;
if (!filter.Parse(args, fold_case)) {
@@ -87,7 +87,7 @@ handle_match(Client &client, ConstBuffer<const char *> args, bool fold_case)
Error error;
return db_selection_print(client, selection, true, false,
window_start, window_end, error)
window.start, window.end, error)
? CommandResult::OK
: print_error(client, error);
}