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

Move db_get_song into sub-handlers. (FReq 2112)

Browse Source 
db_get_song was being called once for all sub-handlers, but with the
addition of the find command, we don't have a URI coming in, so doing
db_get_song once won't work anymore.

[mk: fixed initialization order]
This commit is contained in:
Eric Wollesen 2009-04-01 18:44:39 +02:00 committed by Max Kellermann
parent c51e1bf1c0
commit c95fa4b441
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/command.c
View File

@ -1510,17 +1510,17 @@ handle_idle(struct client *client,
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[])
{ {
struct song *song = db_get_song(argv[3]);
if (song == NULL) {
command_error(client, ACK_ERROR_NO_EXIST,
"no such song");
return COMMAND_RETURN_ERROR;
}
if (argc == 5 && strcmp(argv[1], "get") == 0) { if (argc == 5 && strcmp(argv[1], "get") == 0) {
struct song *song;
char *value; char *value;
song = db_get_song(argv[3]);
if (song == NULL) {
command_error(client, ACK_ERROR_NO_EXIST,
"no such song");
return COMMAND_RETURN_ERROR;
}
value = sticker_song_get_value(song, argv[4]); value = sticker_song_get_value(song, argv[4]);
if (value == NULL) { if (value == NULL) {
command_error(client, ACK_ERROR_NO_EXIST, command_error(client, ACK_ERROR_NO_EXIST,
@ -1533,7 +1533,17 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
} else if (argc == 4 && strcmp(argv[1], "list") == 0) { } else if (argc == 4 && strcmp(argv[1], "list") == 0) {
struct sticker *sticker = sticker_song_get(song); struct song *song;
struct sticker *sticker;
song = db_get_song(argv[3]);
if (song == NULL) {
command_error(client, ACK_ERROR_NO_EXIST,
"no such song");
return COMMAND_RETURN_ERROR;
}
sticker = sticker_song_get(song);
if (NULL == sticker) { if (NULL == sticker) {
command_error(client, ACK_ERROR_NO_EXIST, command_error(client, ACK_ERROR_NO_EXIST,
"no stickers found"); "no stickers found");
@ -1545,8 +1555,16 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
} else if (argc == 6 && strcmp(argv[1], "set") == 0) { } else if (argc == 6 && strcmp(argv[1], "set") == 0) {
struct song *song;
bool ret; bool ret;
song = db_get_song(argv[3]);
if (song == NULL) {
command_error(client, ACK_ERROR_NO_EXIST,
"no such song");
return COMMAND_RETURN_ERROR;
}
ret = sticker_song_set_value(song, argv[4], argv[5]); ret = sticker_song_set_value(song, argv[4], argv[5]);
if (!ret) { if (!ret) {
command_error(client, ACK_ERROR_SYSTEM, command_error(client, ACK_ERROR_SYSTEM,