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

command: added command "sticker find"

Browse Source 
This command allows clients to search for stickers with a specified
name.
This commit is contained in:
Max Kellermann 2009-04-01 18:53:02 +02:00
parent c95fa4b441
commit e720b5bdf8
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/protocol.xml
View File

@ -1288,6 +1288,25 @@ OK
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="command_sticker_find">
<term>
<cmdsynopsis>
<command>sticker</command>
<arg choice="plain">find</arg>
<arg choice="req"><replaceable>TYPE</replaceable></arg>
<arg choice="req"><replaceable>URI</replaceable></arg>
<arg choice="req"><replaceable>NAME</replaceable></arg>
</cmdsynopsis>
</term>
<listitem>
<para>
Searches the sticker database for stickers with the
specified name, below the specified directory (URI).
For each matching song, it prints the URI and that one
sticker's value.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</section> </section>

41
src/command.c
View File

@ -50,6 +50,7 @@
#include "sticker.h" #include "sticker.h"
#include "sticker_print.h" #include "sticker_print.h"
#include "song_sticker.h" #include "song_sticker.h"
#include "song_print.h"
#endif #endif
#include <assert.h> #include <assert.h>
@ -1507,6 +1508,21 @@ handle_idle(struct client *client,
} }
#ifdef ENABLE_SQLITE #ifdef ENABLE_SQLITE
struct sticker_song_find_data {
struct client *client;
const char *name;
};
static void
sticker_song_find_print_cb(struct song *song, const char *value,
gpointer user_data)
{
struct sticker_song_find_data *data = user_data;
song_print_url(data->client, song);
sticker_print_value(data->client, data->name, value);
}
static enum command_return static enum command_return
handle_sticker_song(struct client *client, int argc, char *argv[]) handle_sticker_song(struct client *client, int argc, char *argv[])
{ {
@ -1572,6 +1588,31 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
return COMMAND_RETURN_ERROR; return COMMAND_RETURN_ERROR;
} }
return COMMAND_RETURN_OK;
} else if (argc == 5 && strcmp(argv[1], "find") == 0) {
/* "sticker find song a/directory name" */
struct directory *directory;
bool success;
struct sticker_song_find_data data = {
.client = client,
.name = argv[4],
};
directory = db_get_directory(argv[3]);
if (directory == NULL) {
command_error(client, ACK_ERROR_NO_EXIST,
"no such directory");
return COMMAND_RETURN_ERROR;
}
success = sticker_song_find(directory, data.name,
sticker_song_find_print_cb, &data);
if (!success) {
command_error(client, ACK_ERROR_SYSTEM,
"failed to set search sticker database");
return COMMAND_RETURN_ERROR;
}
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
} else { } else {
command_error(client, ACK_ERROR_ARG, "bad request"); command_error(client, ACK_ERROR_ARG, "bad request");