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

DatabaseCommands: merge duplicate search/find code

Browse Source
This commit is contained in:
Max Kellermann 2012-08-08 00:44:58 +02:00
parent 0823711106
commit 8d2725234e
2 changed files with 31 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/DatabaseCommands.cxx
View File

@ -56,11 +56,11 @@ handle_lsinfo2(struct client *client, int argc, char *argv[])
return COMMAND_RETURN_OK;
}
enum command_return
handle_find(struct client *client, int argc, char *argv[])
static enum command_return
handle_match(struct client *client, int argc, char *argv[], bool fold_case)
{
struct locate_item_list *list =
locate_item_list_parse(argv + 1, argc - 1, false);
locate_item_list_parse(argv + 1, argc - 1, fold_case);
if (list == NULL) {
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
@ -78,53 +78,22 @@ handle_find(struct client *client, int argc, char *argv[])
}
enum command_return
handle_findadd(struct client *client, int argc, char *argv[])
handle_find(struct client *client, int argc, char *argv[])
{
struct locate_item_list *list =
locate_item_list_parse(argv + 1, argc - 1, false);
if (list == NULL) {
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
return COMMAND_RETURN_ERROR;
}
GError *error = NULL;
enum command_return ret =
findAddIn(client->player_control, "", list, &error)
? COMMAND_RETURN_OK
: print_error(client, error);
locate_item_list_free(list);
return ret;
return handle_match(client, argc, argv, false);
}
enum command_return
handle_search(struct client *client, int argc, char *argv[])
{
struct locate_item_list *list =
locate_item_list_parse(argv + 1, argc - 1, true);
if (list == NULL) {
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
return COMMAND_RETURN_ERROR;
}
GError *error = NULL;
enum command_return ret = findSongsIn(client, "", list, &error)
? COMMAND_RETURN_OK
: print_error(client, error);
locate_item_list_free(list);
return ret;
return handle_match(client, argc, argv, true);
}
enum command_return
handle_searchadd(struct client *client, int argc, char *argv[])
static enum command_return
handle_match_add(struct client *client, int argc, char *argv[], bool fold_case)
{
struct locate_item_list *list =
locate_item_list_parse(argv + 1, argc - 1, true);
locate_item_list_parse(argv + 1, argc - 1, fold_case);
if (list == NULL) {
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
return COMMAND_RETURN_ERROR;
@ -141,6 +110,18 @@ handle_searchadd(struct client *client, int argc, char *argv[])
return ret;
}
enum command_return
handle_findadd(struct client *client, int argc, char *argv[])
{
return handle_match_add(client, argc, argv, false);
}
enum command_return
handle_searchadd(struct client *client, int argc, char *argv[])
{
return handle_match_add(client, argc, argv, true);
}
enum command_return
handle_searchaddpl(struct client *client, int argc, char *argv[])
{

25
src/command.c
View File

@ -674,10 +674,11 @@ handle_playlistid(struct client *client, int argc, char *argv[])
}
static enum command_return
handle_playlistfind(struct client *client, int argc, char *argv[])
handle_playlist_match(struct client *client, int argc, char *argv[],
bool fold_case)
{
struct locate_item_list *list =
locate_item_list_parse(argv + 1, argc - 1, false);
locate_item_list_parse(argv + 1, argc - 1, fold_case);
if (list == NULL) {
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
@ -691,22 +692,16 @@ handle_playlistfind(struct client *client, int argc, char *argv[])
return COMMAND_RETURN_OK;
}
static enum command_return
handle_playlistfind(struct client *client, int argc, char *argv[])
{
return handle_playlist_match(client, argc, argv, false);
}
static enum command_return
handle_playlistsearch(struct client *client, int argc, char *argv[])
{
struct locate_item_list *list =
locate_item_list_parse(argv + 1, argc - 1, true);
if (list == NULL) {
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
return COMMAND_RETURN_ERROR;
}
playlist_print_find(client, &g_playlist, list);
locate_item_list_free(list);
return COMMAND_RETURN_OK;
return handle_playlist_match(client, argc, argv, true);
}
static enum command_return