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

Revert "command: new commands "findin", "searchin" with base URI"

Browse Source 
This reverts commit a577944ab5.

Will be replaced by new options for the old commands "search" and
"find".
This commit is contained in:
Max Kellermann
2013-10-29 19:29:22 +01:00
parent 44581dbef5
commit b5fc21b9f4
5 changed files with 4 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/command/DatabaseCommands.cxx
View File

@@ -55,8 +55,7 @@ handle_lsinfo2(Client &client, int argc, char *argv[])
}
static CommandResult
handle_match(Client &client, int argc, char *argv[],
const char *uri, bool fold_case)
handle_match(Client &client, int argc, char *argv[], bool fold_case)
{
SongFilter filter;
if (!filter.Parse(argc - 1, argv + 1, fold_case)) {
@@ -64,7 +63,7 @@ handle_match(Client &client, int argc, char *argv[],
return CommandResult::ERROR;
}
const DatabaseSelection selection(uri, true, &filter);
const DatabaseSelection selection("", true, &filter);
Error error;
return db_selection_print(client, selection, true, error)
@@ -75,25 +74,13 @@ handle_match(Client &client, int argc, char *argv[],
CommandResult
handle_find(Client &client, int argc, char *argv[])
{
return handle_match(client, argc, argv, "", false);
}
CommandResult
handle_find_in(Client &client, int argc, char *argv[])
{
return handle_match(client, argc - 1, argv + 1, argv[1], false);
return handle_match(client, argc, argv, false);
}
CommandResult
handle_search(Client &client, int argc, char *argv[])
{
return handle_match(client, argc, argv, "", true);
}
CommandResult
handle_search_in(Client &client, int argc, char *argv[])
{
return handle_match(client, argc - 1, argv + 1, argv[1], true);
return handle_match(client, argc, argv, true);
}
static CommandResult